This is an automated email from the ASF dual-hosted git repository. fmariani pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit c1433ea07fb044e81e3059eee3afb57612cba560 Author: Croway <[email protected]> AuthorDate: Tue Mar 31 11:41:29 2026 +0200 Upgrade surefire/failsafe to 3.5.5 and align JUnit 6 dependencies camel-parent 4.19.0 adopted JUnit 6 (junit-bom 6.0.3), which manages junit-platform-commons to 6.0.3. The connector's explicit dependency management was pinning junit-jupiter-engine to 5.13.4 — compiled against junit-platform-commons 1.13.4 — creating a binary incompatibility (NoSuchMethodError: CollectionUtils.toUnmodifiableList). Remove the explicit JUnit dependency management and let the junit-bom from camel-parent govern all JUnit artifacts consistently at 6.0.3. Also add junit-platform-launcher/engine/commons 6.0.3 as surefire and failsafe plugin dependencies to override surefire's bundled 1.12.x versions, and bump surefire/failsafe to 3.5.5 to match camel-parent. --- parent/pom.xml | 60 +++++++++++++++++++++++++++++++++++++--------------------- pom.xml | 19 ++++++++++++++++++- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7b0dab07a4..bda5fe2d68 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -47,14 +47,14 @@ <version.maven.buildhelper>1.12</version.maven.buildhelper> <version.maven.bundle>3.5.1</version.maven.bundle> <version.maven.jar>3.1.0</version.maven.jar> - <version.maven.failsafe>3.5.4</version.maven.failsafe> - <version.maven.surefire>3.5.4</version.maven.surefire> + <version.maven.failsafe>3.5.5</version.maven.failsafe> + <version.maven.surefire>3.5.5</version.maven.surefire> <version.scala.library>2.12.12</version.scala.library> <version.maven.maven-remote-resources-plugin>1.6.0</version.maven.maven-remote-resources-plugin> <version.maven.checkstyle>8.29</version.maven.checkstyle> <version.maven.checkstyle.plugin>3.1.0</version.maven.checkstyle.plugin> - <version.maven.surefire.plugin>3.5.4</version.maven.surefire.plugin> + <version.maven.surefire.plugin>3.5.5</version.maven.surefire.plugin> <version.plexus.build.api>0.0.7</version.plexus.build.api> <mycila-license-version>3.0</mycila-license-version> @@ -169,25 +169,7 @@ <type>test-jar</type> </dependency> - <!-- Test dependencies --> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <version>${junit-jupiter-version}</version> - <scope>test</scope> - </dependency> + <!-- Test dependencies (JUnit versions managed by junit-bom via camel-parent) --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-ext</artifactId> @@ -343,6 +325,23 @@ <configuration> <failIfNoTests>false</failIfNoTests> </configuration> + <dependencies> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-engine</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-commons</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + </dependencies> </plugin> <plugin> @@ -363,6 +362,23 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>${version.maven.failsafe}</version> + <dependencies> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-engine</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-commons</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + </dependencies> <executions> <execution> <id>integration-test</id> diff --git a/pom.xml b/pom.xml index 8b511bf056..340448722f 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version> - <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version> + <maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version> <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version> <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version> <maven-source-plugin.version>3.3.1</maven-source-plugin.version> @@ -239,6 +239,23 @@ <configuration> <failIfNoTests>false</failIfNoTests> </configuration> + <dependencies> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-launcher</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-engine</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + <dependency> + <groupId>org.junit.platform</groupId> + <artifactId>junit-platform-commons</artifactId> + <version>${junit6-jupiter-version}</version> + </dependency> + </dependencies> </plugin> </plugins> </pluginManagement>
