[camel] branch springboot22-fix updated: CAMEL-14075: Upgrade to Spring Boot 2.2.0. Got the itests working

[da...@apache.org]

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


The following commit(s) were added to refs/heads/springboot22-fix by this push:
     new 1e2dc3e  CAMEL-14075: Upgrade to Spring Boot 2.2.0. Got the itests working
1e2dc3e is described below

commit 1e2dc3e9477ad5b6d40b310693d6606810b815dd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Oct 28 11:52:32 2019 +0100

    CAMEL-14075: Upgrade to Spring Boot 2.2.0. Got the itests working
---
 .../test/java/org/apache/camel/itest/springboot/CamelCordaTest.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCordaTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCordaTest.java
index ce3a44a..b1916da 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCordaTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelCordaTest.java
@@ -35,6 +35,10 @@ public class CamelCordaTest extends AbstractSpringBootTestSupport {
     public static ITestConfig createTestConfig() {
         return new ITestConfigBuilder()
                 .module(inferModuleName(CamelCordaTest.class))
+                // spring boot 2.2 now find artemis-server JAR and think it can do JMS so we need these extra JARs
+                // artemis-server is pulled in from corda as it has a dependency on that
+                .dependency("org.apache.activemq:artemis-jms-server")
+                .dependency("org.apache.geronimo.specs:geronimo-json_1.0_spec:jar:1.0-alpha-1")
                 .build();
     }