This is an automated email from the ASF dual-hosted git repository. tcunning pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3e6faf495094d5081e5a1a1deb9db4393c4aa22d Author: Tom Cunningham <[email protected]> AuthorDate: Tue Feb 10 09:50:31 2026 -0500 Additional JUnit 6 changes --- .../camel/component/azure/storage/blob/BlobConsumerTest.java | 2 +- components/camel-github2/pom.xml | 2 +- .../github2/integration/GitHub2IntegrationTestSupport.java | 2 +- components/camel-mina-sftp/pom.xml | 2 +- .../file/remote/mina/integration/MinaSftpServerTestSupport.java | 2 +- .../component/file/remote/mina/sftp/BaseServerTestSupport.java | 2 +- .../component/file/remote/mina/sftp/SftpChangedReadLockIT.java | 4 ++-- .../file/remote/mina/sftp/SftpProducerMoveExistingIT.java | 8 ++++---- .../camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java | 2 +- .../http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java | 2 +- .../http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConsumerTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConsumerTest.java index e045d3b7d2bf..de63cac914ed 100644 --- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConsumerTest.java +++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/BlobConsumerTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.azure.storage.blob; import com.azure.storage.common.StorageSharedKeyCredential; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-github2/pom.xml b/components/camel-github2/pom.xml index 13115922bedc..30eb60f2152b 100644 --- a/components/camel-github2/pom.xml +++ b/components/camel-github2/pom.xml @@ -50,7 +50,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-junit5</artifactId> + <artifactId>camel-test-junit6</artifactId> <scope>test</scope> </dependency> diff --git a/components/camel-github2/src/test/java/org/apache/camel/component/github2/integration/GitHub2IntegrationTestSupport.java b/components/camel-github2/src/test/java/org/apache/camel/component/github2/integration/GitHub2IntegrationTestSupport.java index 0a1ec395a0b7..3502006ae717 100644 --- a/components/camel-github2/src/test/java/org/apache/camel/component/github2/integration/GitHub2IntegrationTestSupport.java +++ b/components/camel-github2/src/test/java/org/apache/camel/component/github2/integration/GitHub2IntegrationTestSupport.java @@ -18,7 +18,7 @@ package org.apache.camel.component.github2.integration; import org.apache.camel.CamelContext; import org.apache.camel.component.github2.GitHub2Component; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.BeforeAll; /** diff --git a/components/camel-mina-sftp/pom.xml b/components/camel-mina-sftp/pom.xml index cad23edfe39a..4e4e126d96d2 100644 --- a/components/camel-mina-sftp/pom.xml +++ b/components/camel-mina-sftp/pom.xml @@ -63,7 +63,7 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-junit5</artifactId> + <artifactId>camel-test-junit6</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpServerTestSupport.java b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpServerTestSupport.java index b2a10f501d5b..e3f23ffcb21b 100644 --- a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpServerTestSupport.java +++ b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/integration/MinaSftpServerTestSupport.java @@ -19,7 +19,7 @@ package org.apache.camel.component.file.remote.mina.integration; import java.nio.file.Path; import org.apache.camel.test.infra.ftp.services.embedded.SftpEmbeddedService; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.extension.RegisterExtension; /** diff --git a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/BaseServerTestSupport.java b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/BaseServerTestSupport.java index 0dffb2190c51..06afdddb5f58 100644 --- a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/BaseServerTestSupport.java +++ b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/BaseServerTestSupport.java @@ -16,7 +16,7 @@ */ package org.apache.camel.component.file.remote.mina.sftp; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; public class BaseServerTestSupport extends CamelTestSupport { protected static final String LS = System.lineSeparator(); diff --git a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpChangedReadLockIT.java b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpChangedReadLockIT.java index 44699af945a7..8dffcdacf252 100644 --- a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpChangedReadLockIT.java +++ b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpChangedReadLockIT.java @@ -23,14 +23,14 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.PropertiesComponent; -import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit6.TestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit6.TestSupport.createDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; @EnabledIf(value = "org.apache.camel.test.infra.ftp.services.embedded.SftpUtil#hasRequiredAlgorithms('src/test/resources/sftp/hostkey.pem')") diff --git a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpProducerMoveExistingIT.java b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpProducerMoveExistingIT.java index bffef948e331..74b1e8cc440d 100644 --- a/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpProducerMoveExistingIT.java +++ b/components/camel-mina-sftp/src/test/java/org/apache/camel/component/file/remote/mina/sftp/SftpProducerMoveExistingIT.java @@ -23,10 +23,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIf; -import static org.apache.camel.test.junit5.TestSupport.assertFileExists; -import static org.apache.camel.test.junit5.TestSupport.assertFileNotExists; -import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; -import static org.apache.camel.test.junit5.TestSupport.createCleanDirectory; +import static org.apache.camel.test.junit6.TestSupport.assertFileExists; +import static org.apache.camel.test.junit6.TestSupport.assertFileNotExists; +import static org.apache.camel.test.junit6.TestSupport.assertIsInstanceOf; +import static org.apache.camel.test.junit6.TestSupport.createCleanDirectory; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java index f049a08ceaa5..06af74a57cdc 100644 --- a/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java +++ b/components/camel-mllp/src/test/java/org/apache/camel/component/mllp/MllpTcpServerConsumerThreadPoolTest.java @@ -29,7 +29,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.apache.camel.test.mllp.Hl7TestMessageGenerator; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIfSystemProperty; diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java index 12976aa29846..520a484c4160 100644 --- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java +++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiCodeFirstOnExceptionIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; diff --git a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java index 97908f46dd71..df56c22a13cf 100644 --- a/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java +++ b/components/camel-platform-http-vertx/src/test/java/org/apache/camel/component/platform/http/vertx/RestOpenApiContractFirstOnExceptionIssueTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.test.AvailablePortFinder; -import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit6.CamelTestSupport; import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given;
