This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch springboot22-fix in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2176f0e8ed47f6d241f3cba9c1727e8c110b1e8b Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Oct 28 10:22:20 2019 +0100 CAMEL-14075: Upgrade to Spring Boot 2.2.0. Got the itests working --- .../camel-spring-boot-dependencies-generator/pom.xml | 2 ++ .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ---------- platforms/spring-boot/spring-boot-dm/pom.xml | 12 ++++++------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml index ec547c0..fb8d683 100644 --- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml @@ -136,6 +136,8 @@ <exclude>org.hibernate:hibernate-entitymanager</exclude> <exclude>org.hsqldb:*</exclude> <exclude>org.mockito:*</exclude> + <exclude>org.awaitility:awaitility</exclude> + <exclude>org.hamcrest:hamcrest</exclude> <exclude>org.slf4j:jul-to-slf4j</exclude> <exclude>org.slf4j:log4j-over-slf4j</exclude> 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 16a3b96..5342f24 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 @@ -3764,11 +3764,6 @@ <version>3.4.14</version> </dependency> <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - <version>4.0.1</version> - </dependency> - <dependency> <groupId>org.cassandraunit</groupId> <artifactId>cassandra-unit</artifactId> <version>3.1.3.2</version> @@ -3831,11 +3826,6 @@ <version>2.4.4</version> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - <version>2.2</version> - </dependency> - <dependency> <groupId>org.jruby</groupId> <artifactId>jruby</artifactId> <version>1.7.18</version> diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml index ddfbc6c..f9db7c3 100644 --- a/platforms/spring-boot/spring-boot-dm/pom.xml +++ b/platforms/spring-boot/spring-boot-dm/pom.xml @@ -41,13 +41,13 @@ <properties> <!-- Spring-Boot target version --> - <spring-boot-version>2.1.9.RELEASE</spring-boot-version> + <spring-boot-version>2.2.0.RELEASE</spring-boot-version> <!-- The following dependencies should be aligned with the ones in standard camel parent --> <!-- Needed by BOM generator--> <avro-version>1.8.2</avro-version> <jackson-version>1.9.12</jackson-version> - <testcontainers-version>1.9.1</testcontainers-version> + <testcontainers-version>1.12.3</testcontainers-version> <!-- needed for testing --> <curator-version>2.12.0</curator-version> @@ -57,10 +57,10 @@ <google-guava-version>19.0</google-guava-version> <lucene3-version>3.6.0</lucene3-version> <hadoop2-version>2.7.4</hadoop2-version> - <infinispan-spring-boot-version>2.0.0.Final</infinispan-spring-boot-version> - <cassandra-driver-guava-version>18.0</cassandra-driver-guava-version> - <groovy-version>2.5.3</groovy-version> - <grpc-guava-version>20.0</grpc-guava-version> + <infinispan-spring-boot-version>2.1.7.Final</infinispan-spring-boot-version> + <cassandra-driver-guava-version>19.0</cassandra-driver-guava-version> + <groovy-version>2.5.8</groovy-version> + <grpc-guava-version>26.0-android</grpc-guava-version> <!-- Plugin versions --> <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>