CAMEL-22735: Update Infinispan itests after upgrade to 16.x

components-starter/camel-infinispan-embedded-starter/pom.xml

@@ -27,6 +27,17 @@
   <artifactId>camel-infinispan-embedded-starter</artifactId>
   <packaging>jar</packaging>
   <name>Camel SB Starters :: Infinispan Embedded</name>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-bom</artifactId>
+        <version>${infinispan-version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>

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

tests/camel-itest-spring-boot/pom.xml

@@ -25,7 +25,7 @@
         <groupId>org.apache.camel.springboot</groupId>
         <artifactId>tests</artifactId>
         <version>4.17.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>camel-itest-spring-boot</artifactId>
@@ -223,6 +223,10 @@
                         <itest.springboot.springBootVersion>${spring-boot-version}</itest.springboot.springBootVersion>
                         <!-- To remove once all version conflicts are fixed -->
                         <itest.springboot.failOnRelatedLibraryMismatch>false</itest.springboot.failOnRelatedLibraryMismatch>
+
+                        <!-- Version properties to look up in tests -->
+                        <itest.infinispan.version>${infinispan-version}</itest.infinispan.version>
+                        <itest.infinispan-protostream.version>${infinispan-protostream-version}</itest.infinispan-protostream.version>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanEmbeddedTest.java

@@ -25,14 +25,34 @@
 
 @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 {
         return ArquillianPackager.springBootPackage(createTestConfig());
     }
 
     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

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);