Upgrading Swagger, Wicket Bootstrap, Commons Lang and Jackson
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ae2512ac Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ae2512ac Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ae2512ac Branch: refs/heads/2_0_X Commit: ae2512acc79c315e0f68b5019f3031b71bed1c77 Parents: 2f62dfb Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Mon Jun 19 08:47:48 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Mon Jun 19 08:56:27 2017 +0200 ---------------------------------------------------------------------- ext/swagger-ui/pom.xml | 5 +++++ installer/src/main/resources/izpack/install.xml | 2 +- pom.xml | 17 ++++++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/ae2512ac/ext/swagger-ui/pom.xml ---------------------------------------------------------------------- diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml index 426d29e..8c2f262 100644 --- a/ext/swagger-ui/pom.xml +++ b/ext/swagger-ui/pom.xml @@ -59,6 +59,11 @@ under the License. <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/syncope/blob/ae2512ac/installer/src/main/resources/izpack/install.xml ---------------------------------------------------------------------- diff --git a/installer/src/main/resources/izpack/install.xml b/installer/src/main/resources/izpack/install.xml index 4a112c1..023cea3 100644 --- a/installer/src/main/resources/izpack/install.xml +++ b/installer/src/main/resources/izpack/install.xml @@ -137,7 +137,7 @@ under the License. <jar src="lib/httpclient-@{httpclient.version}.jar"/> <jar src="lib/httpmime-@{httpclient.version}.jar"/> <jar src="lib/httpcore-4.4.6.jar"/> - <jar src="lib/jackson-databind-@{jackson.version}.1.jar"/> + <jar src="lib/jackson-databind-@{jackson.version}.jar"/> <jar src="lib/jackson-core-@{jackson.version}.jar"/> <jar src="lib/jackson-annotations-@{jackson.version}.jar"/> http://git-wip-us.apache.org/repos/asf/syncope/blob/ae2512ac/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7368305..eaca35f 100644 --- a/pom.xml +++ b/pom.xml @@ -355,7 +355,7 @@ under the License. <cxf.version>3.1.12-SNAPSHOT</cxf.version> - <jackson.version>2.8.8</jackson.version> + <jackson.version>2.8.9</jackson.version> <spring.version>4.3.9.RELEASE</spring.version> <spring-security.version>4.2.3.RELEASE</spring-security.version> @@ -389,7 +389,7 @@ under the License. <commons-email.version>1.4</commons-email.version> <commons-codec.version>1.10</commons-codec.version> <commons-jexl.version>3.1</commons-jexl.version> - <commons-lang.version>3.5</commons-lang.version> + <commons-lang.version>3.6</commons-lang.version> <commons-collection.version>4.1</commons-collection.version> <commons-logging.version>1.1.3</commons-logging.version> @@ -406,8 +406,9 @@ under the License. <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory> <flowable-modeler.directory>${project.build.directory}/flowable-modeler</flowable-modeler.directory> - <swagger-core.version>1.5.13</swagger-core.version> + <swagger-core.version>1.5.15</swagger-core.version> <swagger-ui.version>2.2.10</swagger-ui.version> + <guava.version>20.0</guava.version> <jquery.version>2.2.4</jquery.version> <jquery-ui.version>1.11.4</jquery-ui.version> @@ -426,7 +427,7 @@ under the License. <wicket.version>7.7.0</wicket.version> <wicket-jqueryui.version>7.7.0</wicket-jqueryui.version> - <wicket-bootstrap.version>0.10.15</wicket-bootstrap.version> + <wicket-bootstrap.version>0.10.16</wicket-bootstrap.version> <wicket-chartjs.version>7.0.1</wicket-chartjs.version> <angular.version>1.6.4</angular.version> @@ -654,6 +655,12 @@ under the License. <artifactId>swagger-ui</artifactId> <version>${swagger-ui.version}</version> </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> <!-- /Swagger --> <!-- Camel --> @@ -783,7 +790,7 @@ under the License. <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson.version}.1</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId>
