Repository: camel Updated Branches: refs/heads/master 7f2422922 -> 5ae014838
Upgrade starters and dependency management to spring-boot 1.5.1.RELEASE Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ae01483 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ae01483 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ae01483 Branch: refs/heads/master Commit: 5ae014838e1b6d483b7b4a53d2f440b7662353ab Parents: 7f24229 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Thu Mar 2 11:35:20 2017 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Thu Mar 2 12:30:09 2017 +0100 ---------------------------------------------------------------------- .../camel-spring-boot-dependencies/pom.xml | 19 +++++++---------- .../camel-spring-boot-generator-bom/pom.xml | 7 ------- platforms/spring-boot/spring-boot-dm/pom.xml | 22 ++++++++++---------- 3 files changed, 18 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5ae01483/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml index 375fb4a..3a4b43e 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml @@ -51,7 +51,7 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-scala_2.11</artifactId> - <version>2.8.2</version> + <version>2.8.6</version> </dependency> <dependency> <groupId>com.google.code.scriptengines</groupId> @@ -69,11 +69,6 @@ <version>0.30</version> </dependency> <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast-client</artifactId> - <version>3.6.5</version> - </dependency> - <dependency> <groupId>com.jayway.awaitility</groupId> <artifactId>awaitility</artifactId> <version>1.7.0</version> @@ -2967,27 +2962,27 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-api</artifactId> - <version>9.3.11.v20160721</version> + <version>9.4.1.v20170120</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-common</artifactId> - <version>9.3.11.v20160721</version> + <version>9.4.1.v20170120</version> </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-servlet</artifactId> - <version>9.3.11.v20160721</version> + <version>9.4.1.v20170120</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-rewrite</artifactId> - <version>9.3.11.v20160721</version> + <version>9.4.1.v20170120</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>9.3.11.v20160721</version> + <version>9.4.1.v20170120</version> </dependency> <dependency> <groupId>org.jdom</groupId> @@ -3254,7 +3249,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-ext</artifactId> - <version>1.7.21</version> + <version>1.7.22</version> </dependency> <dependency> <groupId>org.testng</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/5ae01483/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml index 6ada50f..32ff1f9 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/pom.xml @@ -78,13 +78,6 @@ <!-- Added to match the version of related libraries provided by spring-boot --> <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast-client</artifactId> - <version>${hazelcast-version}</version> - </dependency> - - <!-- Added to match the version of related libraries provided by spring-boot --> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-ext</artifactId> <version>${slf4j-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/5ae01483/platforms/spring-boot/spring-boot-dm/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml index 31c8afa..8b5c9fa 100644 --- a/platforms/spring-boot/spring-boot-dm/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/pom.xml @@ -39,7 +39,7 @@ <properties> <!-- Spring-Boot target version --> - <spring-boot-version>1.4.2.RELEASE</spring-boot-version> + <spring-boot-version>1.5.1.RELEASE</spring-boot-version> <!-- The following dependencies should be aligned with the ones in standard camel parent --> <avro-version>1.8.1</avro-version> @@ -63,19 +63,19 @@ <cassandra-netty-version-testing>4.0.37.Final</cassandra-netty-version-testing> <!-- The following versions should be aligned with the ones in spring-boot-repo/spring-boot-dependencies/pom.xml (for the targeted version of spring-boot) --> - <jackson2-version>2.8.3</jackson2-version> - <scala-jackson2-version>2.8.2</scala-jackson2-version> - <jetty9-version>9.3.11.v20160721</jetty9-version> + <jackson2-version>2.8.6</jackson2-version> + <scala-jackson2-version>2.8.6</scala-jackson2-version> + <jetty9-version>9.4.1.v20170120</jetty9-version> <jetty-version>${jetty9-version}</jetty-version> <jna-version>4.2.2</jna-version> - <hazelcast-version>3.6.5</hazelcast-version> + <hazelcast-version>3.7.5</hazelcast-version> <htmlunit-version>2.21</htmlunit-version> - <log4j2-version>2.6.2</log4j2-version> - <slf4j-version>1.7.21</slf4j-version> - <spring-version>4.3.3.RELEASE</spring-version> - <spring-data-releasetrain-version>Hopper-SR3</spring-data-releasetrain-version> - <spring-integration-version>4.3.2.RELEASE</spring-integration-version> - <spring-security-version>4.1.3.RELEASE</spring-security-version> + <log4j2-version>2.7</log4j2-version> + <slf4j-version>1.7.22</slf4j-version> + <spring-version>4.3.6.RELEASE</spring-version> + <spring-data-releasetrain-version>Ingalls-RELEASE</spring-data-releasetrain-version> + <spring-integration-version>4.3.7.RELEASE</spring-integration-version> + <spring-security-version>4.2.1.RELEASE</spring-security-version> </properties> <build>
