This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7cb9b5ea203b246fcfc9a0965169eddfcf1a6592 Author: James Netherton <[email protected]> AuthorDate: Thu Nov 27 14:14:59 2025 +0000 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 ++++- .../springboot/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 bd1f076f854..9dc04df7df9 100644 --- a/components-starter/camel-infinispan-embedded-starter/pom.xml +++ b/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> diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml index 63fb6103d22..3a443589494 100644 --- a/tests/camel-itest-spring-boot/pom.xml +++ b/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> 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 f5214769c02..b6b90589611 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 @@ import org.junit.jupiter.api.extension.ExtendWith; @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 class CamelInfinispanEmbeddedTest extends AbstractSpringBootTestSupport { } 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 4145ac6e465..fdf9c5ed8c3 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 @@ import org.junit.jupiter.api.extension.ExtendWith; @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 class CamelInfinispanTest extends AbstractSpringBootTestSupport { 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);
