From 7c5bb48b367268ec181dca38651a6eaee248fa0f Mon Sep 17 00:00:00 2001 From: James Netherton Date: Thu, 27 Nov 2025 14:14:59 +0000 Subject: [PATCH 1/2] CAMEL-22735: Update Infinispan itests after upgrade to 16.x --- .../camel-infinispan-embedded-starter/pom.xml | 11 +++++++ tests/camel-itest-spring-boot/pom.xml | 6 +++- .../CamelInfinispanEmbeddedTest.java | 22 +++++++++++++- .../itest/springboot/CamelInfinispanTest.java | 29 ++++++++++++------- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/components-starter/camel-infinispan-embedded-starter/pom.xml b/components-starter/camel-infinispan-embedded-starter/pom.xml index bd1f076f8547..9dc04df7df97 100644 --- a/components-starter/camel-infinispan-embedded-starter/pom.xml +++ b/components-starter/camel-infinispan-embedded-starter/pom.xml @@ -27,6 +27,17 @@ camel-infinispan-embedded-starter jar Camel SB Starters :: Infinispan Embedded + + + + org.infinispan + infinispan-bom + ${infinispan-version} + pom + import + + + org.springframework.boot diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml index 63fb6103d22b..3a4435894947 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/tests/camel-itest-spring-boot/pom.xml @@ -25,7 +25,7 @@ org.apache.camel.springboot tests 4.17.0-SNAPSHOT - .. + ../pom.xml camel-itest-spring-boot @@ -223,6 +223,10 @@ ${spring-boot-version} false + + + ${infinispan-version} + ${infinispan-protostream-version} diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanEmbeddedTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanEmbeddedTest.java index f5214769c024..b6b905896118 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanEmbeddedTest.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanEmbeddedTest.java @@ -25,6 +25,8 @@ @ExtendWith(ArquillianExtension.class) public class CamelInfinispanEmbeddedTest extends AbstractSpringBootTestSupport { + static final String INFINISPAN_VERSION = System.getProperty("itest.infinispan.version"); + static final String PROTOSTREAM_VERSION = System.getProperty("itest.infinispan-protostream.version"); @Deployment public static Archive createSpringBootPackage() throws Exception { @@ -32,7 +34,25 @@ public static Archive createSpringBootPackage() throws Exception { } public static ITestConfig createTestConfig() { - return new ITestConfigBuilder().module(inferModuleName(CamelInfinispanEmbeddedTest.class)).build(); + return new ITestConfigBuilder().module(inferModuleName(CamelInfinispanTest.class)) + .dependency(infinispanDependency("infinispan-api")) + .dependency(infinispanDependency("infinispan-client-hotrod")) + .dependency(infinispanDependency("infinispan-commons")) + .dependency(infinispanDependency("infinispan-component-annotations")) + .dependency(infinispanDependency("infinispan-core")) + .dependency(infinispanDependency("infinispan-counter-api")) + .dependency(infinispanDependency("infinispan-query")) + .dependency(protostreamDependency("protostream")) + .dependency(protostreamDependency("protostream-types")) + .build(); + } + + static String infinispanDependency(String artifactId) { + return "org.infinispan:%s:%s".formatted(artifactId, INFINISPAN_VERSION); + } + + static String protostreamDependency(String artifactId) { + return "org.infinispan.protostream:%s:%s".formatted(artifactId, PROTOSTREAM_VERSION); } @Test diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java index 4145ac6e465f..fdf9c5ed8c31 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java @@ -25,6 +25,8 @@ @ExtendWith(ArquillianExtension.class) public class CamelInfinispanTest extends AbstractSpringBootTestSupport { + static final String INFINISPAN_VERSION = System.getProperty("itest.infinispan.version"); + static final String PROTOSTREAM_VERSION = System.getProperty("itest.infinispan-protostream.version"); @Deployment public static Archive createSpringBootPackage() throws Exception { @@ -33,19 +35,26 @@ public static Archive createSpringBootPackage() throws Exception { public static ITestConfig createTestConfig() { return new ITestConfigBuilder().module(inferModuleName(CamelInfinispanTest.class)) - .dependency("org.infinispan:infinispan-client-hotrod:14.0.21.Final") - .dependency("org.infinispan:infinispan-commons:14.0.21.Final") - .dependency("org.infinispan:infinispan-component-annotations:14.0.21.Final") - .dependency("org.infinispan:infinispan-core:14.0.21.Final") - .dependency("org.infinispan:infinispan-query-dsl:14.0.21.Final") - .dependency("org.infinispan:infinispan-jboss-marshalling:14.0.21.Final") - .dependency("org.infinispan:infinispan-marshaller-protostuff:14.0.21.Final") - .dependency("org.infinispan:infinispan-remote-query-client:14.0.21.Final") - .dependency("org.infinispan.protostream:protostream-types:4.6.5.Final") - .dependency("org.infinispan.protostream:protostream:4.6.5.Final").disableJmx("org.infinispan:*") + .dependency(infinispanDependency("infinispan-api")) + .dependency(infinispanDependency("infinispan-client-hotrod")) + .dependency(infinispanDependency("infinispan-commons")) + .dependency(infinispanDependency("infinispan-counter-api")) + .dependency(infinispanDependency("infinispan-core")) + .dependency(infinispanDependency("infinispan-query")) + .dependency(protostreamDependency("protostream")) + .dependency(protostreamDependency("protostream-types")) + .disableJmx("org.infinispan:*") .build(); } + static String infinispanDependency(String artifactId) { + return "org.infinispan:%s:%s".formatted(artifactId, INFINISPAN_VERSION); + } + + static String protostreamDependency(String artifactId) { + return "org.infinispan.protostream:%s:%s".formatted(artifactId, PROTOSTREAM_VERSION); + } + @Test public void componentTests() throws Exception { this.runComponentTest(config); From 1d77f4f00580a67415c795efda44bc88082ca84c Mon Sep 17 00:00:00 2001 From: James Netherton Date: Thu, 27 Nov 2025 14:15:43 +0000 Subject: [PATCH 2/2] Update itest README with current state of itest.springboot property defaults --- tests/camel-itest-spring-boot/README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/camel-itest-spring-boot/README.adoc b/tests/camel-itest-spring-boot/README.adoc index 46b37cf5db5f..6a791b6dbb2c 100644 --- a/tests/camel-itest-spring-boot/README.adoc +++ b/tests/camel-itest-spring-boot/README.adoc @@ -19,10 +19,10 @@ Some useful options include: * **itest.springboot.includeTestDependencies (default=true)**: when this option is enabled, the integration test will locate the module `pom.xml` file and include in the spring-boot jar also the test-scoped dependencies of the module. The inclusion of other libraries often activates some hidden behaviour of spring-boot. -* **itest.springboot.unitTestEnabled (default=false)**: when this option is enabled, +* **itest.springboot.unitTestEnabled (default=true)**: when this option is enabled, the integration test will locate the test-classes of the module and run the unit tests after the execution of the usual checks. *Note: a full build of each component is required prior to running the unit tests. Test dependencies are implicitly included.* -* **itest.springboot.failOnRelatedLibraryMismatch (default=true)**: when this option is enabled, +* **itest.springboot.failOnRelatedLibraryMismatch (default=false)**: when this option is enabled, the integration test will only print a warning in case of a version conflict between SpringBoot and Camel SpringBoot Boms instead of failing. * **itest.springboot.debugEnabled (default=false)**: when this option is enabled, the integration test will print all messages that are helpful for debugging purposes