You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2025/11/27 16:37:13 UTC
(camel-spring-boot) branch main updated (e51ab794094 -> bda236f4a7f)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
from e51ab794094 Regen
new 7cb9b5ea203 CAMEL-22735: Update Infinispan itests after upgrade to 16.x
new bda236f4a7f Update itest README with current state of itest.springboot property defaults
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-infinispan-embedded-starter/pom.xml | 11 ++++++++
tests/camel-itest-spring-boot/README.adoc | 4 +--
tests/camel-itest-spring-boot/pom.xml | 6 ++++-
.../springboot/CamelInfinispanEmbeddedTest.java | 22 +++++++++++++++-
.../itest/springboot/CamelInfinispanTest.java | 29 ++++++++++++++--------
5 files changed, 58 insertions(+), 14 deletions(-)
(camel-spring-boot) 02/02: Update itest README with current state of itest.springboot property defaults
Posted by ja...@apache.org.
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 bda236f4a7fae4d4b3b2179681144b8bf42e955c
Author: James Netherton <ja...@gmail.com>
AuthorDate: Thu Nov 27 14:15:43 2025 +0000
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 46b37cf5db5..6a791b6dbb2 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
(camel-spring-boot) 01/02: CAMEL-22735: Update Infinispan itests after upgrade to 16.x
Posted by ja...@apache.org.
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 <ja...@gmail.com>
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);