This is an automated email from the ASF dual-hosted git repository.
claudio4j pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 89c6e77acba4 CAMEL-22720 Update testcontainer to 2.0.2 (#20022)
89c6e77acba4 is described below
commit 89c6e77acba4673d0118d0896ec467e4407c4148
Author: Claudio Miranda <[email protected]>
AuthorDate: Mon Nov 24 17:19:50 2025 +0000
CAMEL-22720 Update testcontainer to 2.0.2 (#20022)
Also replaced outdated org.junit.Assert for the jupiter api
---
.../chat/LangChain4jRagAggregatorTest.java | 3 ---
...gChain4jEmbeddingsComponentInfinispanTargetIT.java | 2 +-
...gChain4jEmbeddingStoreComponentQdrantTargetIT.java | 2 +-
...hain4jEmbeddingStoreComponentWeaviateTargetIT.java | 3 +--
.../apache/camel/component/neo4j/it/Neo4jNodeIT.java | 5 -----
.../component/neo4j/it/Neo4jVectorEmbeddingsIT.java | 4 ----
.../localstack/EventbridgeDeleteRuleIT.java | 2 +-
.../localstack/EventbridgeDescribeRuleIT.java | 4 ++--
.../localstack/EventbridgeListTargetsByRuleIT.java | 2 +-
.../localstack/EventbridgePutEventsIT.java | 8 ++++----
.../localstack/EventbridgeRemoveTargetsIT.java | 2 +-
.../component/aws2/kms/localstack/KmsCreateKeyIT.java | 4 ++--
.../aws2/kms/localstack/KmsDescribeKeyIT.java | 2 +-
.../aws2/kms/localstack/KmsDisableKeyIT.java | 4 ++--
.../component/aws2/kms/localstack/KmsEnableKeyIT.java | 4 ++--
.../component/aws2/kms/localstack/KmsListKeysIT.java | 4 ++--
.../aws2/kms/localstack/KmsScheduleDeleteKeyIT.java | 2 +-
.../aws2/lambda/integration/LambdaAliasesIT.java | 2 +-
.../lambda/integration/LambdaCreateFunctionIT.java | 4 ++--
.../lambda/integration/LambdaDeleteFunctionIT.java | 2 +-
.../aws2/lambda/integration/LambdaGetFunctionIT.java | 4 ++--
.../lambda/integration/LambdaListFunctionsIT.java | 4 ++--
.../lambda/integration/LambdaPublishVersionIT.java | 4 ++--
.../aws2/s3/integration/S3ConsumerIgnoreBodyIT.java | 4 ++--
.../aws2/s3/integration/S3ConsumerIncludeBodyIT.java | 4 ++--
...eDownloadLinkWithProvidedPresignerOperationIT.java | 2 +-
.../SnsTopicProducerByteArrayHeaderIT.java | 6 +++---
.../SqsProducerSendByteArrayLocalstackIT.java | 6 +++---
.../SqsProducerSendLocalstackMaxAttributesIT.java | 4 ++--
.../aws2/sts/integration/StsAssumeRoleIT.java | 4 ++--
.../aws2/sts/integration/StsGetFederationTokenIT.java | 4 ++--
.../aws2/sts/integration/StsGetSessionTokenIT.java | 4 ++--
components/camel-consul/pom.xml | 4 ++--
.../apache/camel/component/consul/MockAgentTest.java | 2 +-
.../cluster/ConsulClusteredRoutePolicyFactoryIT.java | 2 +-
.../consul/cluster/ConsulClusteredRoutePolicyIT.java | 2 +-
.../component/consul/cluster/ConsulMasterIT.java | 2 +-
components/camel-dhis2/camel-dhis2-component/pom.xml | 2 +-
.../integration/SingleExchangeRoundAllHeadersIT.java | 2 +-
.../remote/InfinispanRemoteConfigurationIT.java | 2 +-
.../remote/InfinispanRemoteEmbeddingStoreIT.java | 2 +-
.../remote/InfinispanRemoteTestSupport.java | 2 +-
.../cluster/InfinispanRemoteClusteredTestSupport.java | 2 +-
...cerMultipleMessagesInTransactionWithSplitTest.java | 2 +-
.../kafka/integration/KafkaConsumerAuthInvalidIT.java | 3 +--
.../KafkaConsumerAuthInvalidWithReconnectIT.java | 10 +++++-----
.../integration/KafkaConsumerAuthManualTest.java | 5 +++--
.../kafka/integration/common/KafkaAdminUtil.java | 10 ++++------
.../integration/MinioListObjectsOperationIT.java | 2 +-
.../mongodb/integration/MongoDbConversionsIT.java | 2 +-
.../integration/MongoDbTypeConvertersTest.java | 2 +-
.../nats/NatsSplitServersMultiprotocolTest.java | 10 +++++-----
components/camel-pgevent/pom.xml | 2 +-
.../component/salesforce/CompoundTypesManualIT.java | 4 ++--
.../camel/component/salesforce/PubSubApiTest.java | 4 ++--
.../camel/component/smb/SmbComponentConnectionIT.java | 8 ++++----
components/camel-zeebe/pom.xml | 2 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_17.adoc | 4 ++++
.../apache/camel/dsl/jbang/it/support/InVersion.java | 6 +++---
.../camel/dsl/jbang/it/support/JBangTestSupport.java | 2 +-
.../src/test/resources/docker-java.properties | 17 -----------------
parent/pom.xml | 2 +-
test-infra/camel-test-infra-cassandra/pom.xml | 2 +-
test-infra/camel-test-infra-cli/pom.xml | 18 ++++++++++++++----
.../org/apache/camel/test/infra/cli/it/RunITCase.java | 4 ++--
.../infra/cli/services/CliLocalContainerService.java | 19 ++++++++++---------
test-infra/camel-test-infra-couchbase/pom.xml | 2 +-
test-infra/camel-test-infra-elasticsearch/pom.xml | 2 +-
test-infra/camel-test-infra-google-pubsub/pom.xml | 2 +-
test-infra/camel-test-infra-hivemq/pom.xml | 2 +-
test-infra/camel-test-infra-jdbc/pom.xml | 2 +-
test-infra/camel-test-infra-kafka/pom.xml | 4 ++--
test-infra/camel-test-infra-milvus/pom.xml | 2 +-
test-infra/camel-test-infra-mongodb/pom.xml | 2 +-
test-infra/camel-test-infra-neo4j/pom.xml | 2 +-
test-infra/camel-test-infra-ollama/pom.xml | 2 +-
test-infra/camel-test-infra-parent/pom.xml | 2 +-
test-infra/camel-test-infra-pinecone/pom.xml | 2 +-
test-infra/camel-test-infra-postgres/pom.xml | 2 +-
test-infra/camel-test-infra-pulsar/pom.xml | 2 +-
test-infra/camel-test-infra-qdrant/pom.xml | 2 +-
test-infra/camel-test-infra-rabbitmq/pom.xml | 2 +-
test-infra/camel-test-infra-weaviate/pom.xml | 2 +-
83 files changed, 149 insertions(+), 166 deletions(-)
diff --git
a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java
b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java
index 606e08800aef..80e9f860f743 100644
---
a/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java
+++
b/components/camel-ai/camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j/chat/LangChain4jRagAggregatorTest.java
@@ -30,9 +30,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.langchain4j.chat.LangChain4jChatHeaders.AUGMENTED_DATA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
public class LangChain4jRagAggregatorTest {
diff --git
a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
index 84c4a43b0905..b205f59433e7 100644
---
a/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
+++
b/components/camel-ai/camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentInfinispanTargetIT.java
@@ -43,6 +43,7 @@ import
org.apache.camel.support.task.budget.IterationBoundedBudget;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import
org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.commons.lang3.SystemUtils;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.commons.configuration.StringConfiguration;
@@ -53,7 +54,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
import static org.assertj.core.api.Assertions.assertThat;
diff --git
a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
index aa7080752080..cf0f6a5c79c7 100644
---
a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
+++
b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentQdrantTargetIT.java
@@ -50,7 +50,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static
dev.langchain4j.store.embedding.filter.MetadataFilterBuilder.metadataKey;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git
a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
index bf6c126db250..62fc25626a1b 100644
---
a/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
+++
b/components/camel-ai/camel-langchain4j-embeddingstore/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingStoreComponentWeaviateTargetIT.java
@@ -47,8 +47,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import static
dev.langchain4j.store.embedding.filter.MetadataFilterBuilder.metadataKey;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git
a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jNodeIT.java
b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jNodeIT.java
index 41d3ad8e1dd7..b23502291eb6 100644
---
a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jNodeIT.java
+++
b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jNodeIT.java
@@ -30,11 +30,6 @@ import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class Neo4jNodeIT extends Neo4jTestSupport {
diff --git
a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jVectorEmbeddingsIT.java
b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jVectorEmbeddingsIT.java
index 98417a1f3b77..7c98894000aa 100644
---
a/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jVectorEmbeddingsIT.java
+++
b/components/camel-ai/camel-neo4j/src/test/java/org/apache/camel/component/neo4j/it/Neo4jVectorEmbeddingsIT.java
@@ -33,10 +33,6 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class Neo4jVectorEmbeddingsIT extends Neo4jTestSupport {
@Test
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
index 92974690855c..3c11f99261f0 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDeleteRuleIT.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.eventbridge.model.DeleteRuleResponse;
import software.amazon.awssdk.services.eventbridge.model.Target;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class EventbridgeDeleteRuleIT extends Aws2EventbridgeBase {
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
index 71cbb8a730b6..8d3f8fdcb925 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeDescribeRuleIT.java
@@ -30,8 +30,8 @@ import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.eventbridge.model.DescribeRuleResponse;
import software.amazon.awssdk.services.eventbridge.model.Target;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class EventbridgeDescribeRuleIT extends Aws2EventbridgeBase {
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
index d1e9862d7297..163b4dc9eaaa 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeListTargetsByRuleIT.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
import
software.amazon.awssdk.services.eventbridge.model.ListTargetsByRuleResponse;
import software.amazon.awssdk.services.eventbridge.model.Target;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class EventbridgeListTargetsByRuleIT extends Aws2EventbridgeBase {
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
index 7ff9eecd9600..364725e5c867 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgePutEventsIT.java
@@ -29,7 +29,7 @@ import
org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -71,9 +71,9 @@ public class EventbridgePutEventsIT extends CamelTestSupport {
}
});
MockEndpoint.assertIsSatisfied(context);
-
Assert.assertTrue(result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).hasEntries());
- Assert.assertEquals(1,
result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).entries().size());
- Assert.assertNotNull(
+
Assertions.assertTrue(result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).hasEntries());
+ Assertions.assertEquals(1,
result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).entries().size());
+ Assertions.assertNotNull(
result.getExchanges().get(0).getMessage().getBody(PutEventsResponse.class).entries().get(0).eventId());
}
diff --git
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
index bbe4188e3d50..72b9f718fad8 100644
---
a/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
+++
b/components/camel-aws/camel-aws2-eventbridge/src/test/java/org/apache/camel/component/aws2/eventbridge/localstack/EventbridgeRemoveTargetsIT.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.eventbridge.model.Target;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@Disabled("Doesn't work with Localstack v4")
public class EventbridgeRemoveTargetsIT extends Aws2EventbridgeBase {
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
index f15c4bed7d8a..a4ddd1b5adeb 100644
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
+++
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsCreateKeyIT.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
disabledReason = "Flaky on GitHub Actions")
public class KmsCreateKeyIT extends Aws2KmsBase {
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
index ca62fd8679a0..05210730d335 100644
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
+++
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyIT.java
@@ -28,7 +28,7 @@ import
software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.DescribeKeyResponse;
import software.amazon.awssdk.services.kms.model.KeyState;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class KmsDescribeKeyIT extends Aws2KmsBase {
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
index b77b78f9abd8..d428bed33a99 100644
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
+++
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDisableKeyIT.java
@@ -28,8 +28,8 @@ import
org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
disabledReason = "Flaky on GitHub Actions")
public class KmsDisableKeyIT extends Aws2KmsBase {
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
index 775bb9541e37..3c6cead51c0c 100644
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
+++
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyIT.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class KmsEnableKeyIT extends Aws2KmsBase {
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
index 81b360071a9e..fd1d793f0d09 100644
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
+++
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsListKeysIT.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.kms.model.ListKeysResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
disabledReason = "Flaky on GitHub Actions")
public class KmsListKeysIT extends Aws2KmsBase {
diff --git
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
index a41b374b1190..73ce9672f31b 100644
---
a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
+++
b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsScheduleDeleteKeyIT.java
@@ -28,7 +28,7 @@ import
software.amazon.awssdk.services.kms.model.CreateKeyResponse;
import software.amazon.awssdk.services.kms.model.DescribeKeyResponse;
import software.amazon.awssdk.services.kms.model.KeyState;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class KmsScheduleDeleteKeyIT extends Aws2KmsBase {
diff --git
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
index 3713d907fdd6..5d7e2346c481 100644
---
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
+++
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaAliasesIT.java
@@ -30,7 +30,7 @@ import
software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
import software.amazon.awssdk.services.lambda.model.GetAliasResponse;
import software.amazon.awssdk.services.lambda.model.ListAliasesResponse;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
disabledReason = "Flaky on GitHub Actions")
diff --git
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
index 78963f75706d..831487199c7d 100644
---
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
+++
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaCreateFunctionIT.java
@@ -30,8 +30,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class LambdaCreateFunctionIT extends Aws2LambdaBase {
diff --git
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
index 4a2a4aed44d0..2db075c90692 100644
---
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
+++
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaDeleteFunctionIT.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.lambda.model.DeleteFunctionResponse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
disabledReason = "Flaky on GitHub Actions")
public class LambdaDeleteFunctionIT extends Aws2LambdaBase {
diff --git
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
index 7c1283118daa..5ab9b80f4096 100644
---
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
+++
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaGetFunctionIT.java
@@ -30,8 +30,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.lambda.model.GetFunctionResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class LambdaGetFunctionIT extends Aws2LambdaBase {
diff --git
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
index c28a96b3a4ad..e5297f85e91c 100644
---
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
+++
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaListFunctionsIT.java
@@ -31,8 +31,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import software.amazon.awssdk.services.lambda.model.ListFunctionsResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
disabledReason = "Flaky on GitHub Actions")
public class LambdaListFunctionsIT extends Aws2LambdaBase {
diff --git
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
index 6b4266c2f467..77e4f6f159af 100644
---
a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
+++
b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/integration/LambdaPublishVersionIT.java
@@ -30,8 +30,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.lambda.model.PublishVersionResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class LambdaPublishVersionIT extends Aws2LambdaBase {
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
index ab14dabd2496..63cece15f0ae 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIgnoreBodyIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.awaitility.Awaitility;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class S3ConsumerIgnoreBodyIT extends Aws2S3Base {
@@ -52,7 +52,7 @@ public class S3ConsumerIgnoreBodyIT extends Aws2S3Base {
Awaitility.await().atMost(10, TimeUnit.SECONDS)
.untilAsserted(() -> MockEndpoint.assertIsSatisfied(context));
- Assert.assertNull(result.getExchanges().get(0).getMessage().getBody());
+
Assertions.assertNull(result.getExchanges().get(0).getMessage().getBody());
}
@Override
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
index 650b03ff6063..221741adcf38 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3ConsumerIncludeBodyIT.java
@@ -25,8 +25,8 @@ import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class S3ConsumerIncludeBodyIT extends Aws2S3Base {
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
index 3272d3fa909b..4cc97593d38a 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3CreateDownloadLinkWithProvidedPresignerOperationIT.java
@@ -32,7 +32,7 @@ import
software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class S3CreateDownloadLinkWithProvidedPresignerOperationIT extends
Aws2S3Base {
diff --git
a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java
b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java
index 0c257e69b0b0..2ad8af59c361 100644
---
a/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java
+++
b/components/camel-aws/camel-aws2-sns/src/test/java/org/apache/camel/component/aws2/sns/integration/SnsTopicProducerByteArrayHeaderIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws2.sns.Sns2Constants;
import org.apache.camel.test.infra.common.SharedNameGenerator;
import org.apache.camel.test.infra.common.TestEntityNameGenerator;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.testcontainers.shaded.org.bouncycastle.util.Strings;
@@ -47,7 +47,7 @@ public class SnsTopicProducerByteArrayHeaderIT extends
Aws2SNSBase {
});
assertNotNull(exchange.getIn().getHeader(Sns2Constants.MESSAGE_ID));
- Assert.assertEquals("HeaderTest",
+ Assertions.assertEquals("HeaderTest",
Strings.fromByteArray((byte[])
exchange.getMessage().getHeaders().get("value1")));
}
@@ -63,7 +63,7 @@ public class SnsTopicProducerByteArrayHeaderIT extends
Aws2SNSBase {
});
assertNotNull(exchange.getMessage().getHeader(Sns2Constants.MESSAGE_ID));
- Assert.assertEquals("HeaderTest",
+ Assertions.assertEquals("HeaderTest",
Strings.fromByteArray((byte[])
exchange.getMessage().getHeaders().get("value1")));
}
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
index 93d9fda2d7e0..764c0ace7473 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendByteArrayLocalstackIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.testcontainers.shaded.org.bouncycastle.util.Strings;
@@ -49,8 +49,8 @@ public class SqsProducerSendByteArrayLocalstackIT extends
Aws2SQSBaseTest {
});
MockEndpoint.assertIsSatisfied(context);
- Assert.assertEquals(3,
result.getExchanges().get(0).getMessage().getHeaders().size());
- Assert.assertEquals("HeaderTest",
+ Assertions.assertEquals(3,
result.getExchanges().get(0).getMessage().getHeaders().size());
+ Assertions.assertEquals("HeaderTest",
Strings.fromByteArray((byte[])
result.getExchanges().get(0).getMessage().getHeaders().get("value1")));
}
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
index 14c3a99cda0f..e0dfdf61537e 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsProducerSendLocalstackMaxAttributesIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class SqsProducerSendLocalstackMaxAttributesIT extends Aws2SQSBaseTest {
@@ -56,7 +56,7 @@ public class SqsProducerSendLocalstackMaxAttributesIT extends
Aws2SQSBaseTest {
});
MockEndpoint.assertIsSatisfied(context);
- Assert.assertEquals(13,
result.getExchanges().get(0).getMessage().getHeaders().size());
+ Assertions.assertEquals(13,
result.getExchanges().get(0).getMessage().getHeaders().size());
}
@Override
diff --git
a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
index daa018656d91..a0746c2739f1 100644
---
a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
+++
b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsAssumeRoleIT.java
@@ -27,8 +27,8 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.sts.model.AssumeRoleResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
@Disabled("Doesn't work with Localstack 4.4.0")
public class StsAssumeRoleIT extends Aws2StsBase {
diff --git
a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
index fa2390dbde58..d5e0040b49c6 100644
---
a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
+++
b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetFederationTokenIT.java
@@ -26,8 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.sts.model.GetFederationTokenResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class StsGetFederationTokenIT extends Aws2StsBase {
diff --git
a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
index a1db7fcd1cf1..c94e3dc17b16 100644
---
a/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
+++
b/components/camel-aws/camel-aws2-sts/src/test/java/org/apache/camel/component/aws2/sts/integration/StsGetSessionTokenIT.java
@@ -26,8 +26,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.sts.model.GetSessionTokenResponse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class StsGetSessionTokenIT extends Aws2StsBase {
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index f9c9ae32f876..1d709d71fff6 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -125,7 +125,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
@@ -145,7 +145,7 @@
<artifactId>camel-spring-main</artifactId>
<scope>test</scope>
</dependency>
-
+
<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
index 720ee0e3cb7c..e5afcbbfc0aa 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/MockAgentTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.consul;
import java.util.Map;
+import com.google.common.collect.ImmutableMap;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.AdviceWith;
import org.apache.camel.builder.RouteBuilder;
@@ -28,7 +29,6 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.kiwiproject.consul.model.health.ImmutableService;
import org.kiwiproject.consul.model.health.Service;
-import org.testcontainers.shaded.com.google.common.collect.ImmutableMap;
import static org.apache.camel.builder.Builder.constant;
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
index d66288a3da98..1d74a412a1e5 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyFactoryIT.java
@@ -30,12 +30,12 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.cluster.ClusteredRoutePolicyFactory;
import org.apache.camel.test.infra.consul.services.ConsulService;
import org.apache.camel.test.infra.consul.services.ConsulServiceFactory;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
public class ConsulClusteredRoutePolicyFactoryIT {
@RegisterExtension
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
index 6f17644696dd..c100c90e4558 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulClusteredRoutePolicyIT.java
@@ -30,12 +30,12 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.cluster.ClusteredRoutePolicy;
import org.apache.camel.test.infra.consul.services.ConsulService;
import org.apache.camel.test.infra.consul.services.ConsulServiceFactory;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
public class ConsulClusteredRoutePolicyIT {
@RegisterExtension
diff --git
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
index d97891495944..6ce4dc7ce428 100644
---
a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
+++
b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cluster/ConsulMasterIT.java
@@ -29,12 +29,12 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.infra.consul.services.ConsulService;
import org.apache.camel.test.infra.consul.services.ConsulServiceFactory;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
public class ConsulMasterIT {
@RegisterExtension
diff --git a/components/camel-dhis2/camel-dhis2-component/pom.xml
b/components/camel-dhis2/camel-dhis2-component/pom.xml
index 39c2f2bdcdb5..54057c1384ab 100644
--- a/components/camel-dhis2/camel-dhis2-component/pom.xml
+++ b/components/camel-dhis2/camel-dhis2-component/pom.xml
@@ -57,7 +57,7 @@
<!-- testing -->
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
+ <artifactId>testcontainers-postgresql</artifactId>
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundAllHeadersIT.java
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundAllHeadersIT.java
index e401bdc3efe2..1528831233e6 100644
---
a/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundAllHeadersIT.java
+++
b/components/camel-google/camel-google-pubsub/src/test/java/org/apache/camel/component/google/pubsub/integration/SingleExchangeRoundAllHeadersIT.java
@@ -30,9 +30,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class SingleExchangeRoundAllHeadersIT extends PubsubTestSupport {
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
index 34b6ee694a14..856443058cec 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
@@ -20,13 +20,13 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import
org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
+import org.apache.commons.lang3.SystemUtils;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.commons.api.BasicCache;
import org.infinispan.configuration.cache.CacheMode;
import org.jgroups.util.UUID;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEmbeddingStoreIT.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEmbeddingStoreIT.java
index 1c226598e6d5..b0b7f5902fa2 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEmbeddingStoreIT.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteEmbeddingStoreIT.java
@@ -29,6 +29,7 @@ import
org.apache.camel.component.infinispan.InfinispanConstants;
import org.apache.camel.component.infinispan.InfinispanOperation;
import
org.apache.camel.component.infinispan.remote.embeddingstore.EmbeddingStoreUtil;
import org.apache.camel.spi.DataType;
+import org.apache.commons.lang3.SystemUtils;
import org.awaitility.Awaitility;
import org.infinispan.api.annotations.indexing.option.VectorSimilarity;
import org.infinispan.client.hotrod.RemoteCacheManager;
@@ -40,7 +41,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
index 85c436e163fb..249d786a6d5f 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
@@ -28,6 +28,7 @@ import org.apache.camel.support.task.budget.Budgets;
import org.apache.camel.support.task.budget.IterationBoundedBudget;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import
org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
+import org.apache.commons.lang3.SystemUtils;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.commons.api.BasicCache;
@@ -38,7 +39,6 @@ import org.junit.jupiter.api.TestMethodOrder;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
@TestMethodOrder(MethodOrderer.MethodName.class)
public class InfinispanRemoteTestSupport extends InfinispanTestSupport {
diff --git
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
index 4e2fb48535ce..b9f1e456d15a 100644
---
a/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
+++
b/components/camel-infinispan/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
@@ -19,11 +19,11 @@ package
org.apache.camel.component.infinispan.remote.cluster;
import java.util.Properties;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
+import org.apache.commons.lang3.SystemUtils;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.Configuration;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.configuration.cache.CacheMode;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
public final class InfinispanRemoteClusteredTestSupport {
private InfinispanRemoteClusteredTestSupport() {
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java
index 529041a60f4a..c59b14a90def 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaProducerMultipleMessagesInTransactionWithSplitTest.java
@@ -33,9 +33,9 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.mockito.Mockito;
-import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
@TestMethodOrder(MethodOrderer.MethodName.class)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
index 45082c25220a..27aa6ba6668f 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidIT.java
@@ -36,7 +36,6 @@ import
org.apache.camel.test.infra.kafka.services.KafkaServiceFactory;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.ConsumerGroupDescription;
import org.apache.kafka.common.config.SaslConfigs;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -163,7 +162,7 @@ public class KafkaConsumerAuthInvalidIT {
kafkaAdminClient));
final ConsumerGroupDescription groupInfo =
allGroups.get("KafkaConsumerAuthInvalidIT");
- Assert.assertEquals("There should be no members in this group", 0,
groupInfo.members().size());
+ Assertions.assertEquals(0, groupInfo.members().size(), "There should
be no members in this group");
for (Exchange exchange : dlq.getExchanges()) {
Assertions.assertEquals("should-no-work",
exchange.getFromRouteId());
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
index 8d287f306589..01a65bd25dd6 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
@@ -33,8 +33,8 @@ import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.ConsumerGroupDescription;
import org.apache.kafka.common.config.SaslConfigs;
import org.awaitility.Awaitility;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.MethodOrderer;
@@ -148,7 +148,7 @@ public class KafkaConsumerAuthInvalidWithReconnectIT {
() ->
KafkaAdminUtil.getConsumerGroupInfo("KafkaConsumerAuthInvalidWithReconnectIT",
adminClient));
final ConsumerGroupDescription groupInfo =
allGroups.get("KafkaConsumerAuthInvalidWithReconnectIT");
- Assert.assertEquals("There should be no members in this group", 0,
groupInfo.members().size());
+ Assertions.assertEquals(0, groupInfo.members().size(), "There should
be no members in this group");
adminClient.close();
}
@@ -174,10 +174,10 @@ public class KafkaConsumerAuthInvalidWithReconnectIT {
= assertDoesNotThrow(
() ->
KafkaAdminUtil.getConsumerGroupInfo("KafkaConsumerAuthInvalidWithReconnectIT",
adminClient));
- Assert.assertTrue("There should be at least one group named
KafkaConsumerAuthInvalidWithReconnectIT",
- allGroups.size() >= 1);
+ Assertions.assertTrue(allGroups.size() >= 1,
+ "There should be at least one group named
KafkaConsumerAuthInvalidWithReconnectIT");
final ConsumerGroupDescription groupInfo =
allGroups.get("KafkaConsumerAuthInvalidWithReconnectIT");
- Assert.assertNotNull("There should be at least one group named
KafkaConsumerAuthInvalidWithReconnectIT", groupInfo);
+ Assertions.assertNotNull(groupInfo, "There should be at least one
group named KafkaConsumerAuthInvalidWithReconnectIT");
}
}
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
index e93b6ba88bd5..26d2545d318b 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
@@ -30,8 +30,8 @@ import
org.apache.camel.test.infra.core.annotations.RouteFixture;
import
org.apache.camel.test.infra.kafka.services.ContainerLocalAuthKafkaService;
import org.apache.kafka.common.config.SaslConfigs;
import org.awaitility.Awaitility;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.MethodOrderer;
@@ -130,7 +130,8 @@ public class KafkaConsumerAuthManualTest {
to.expectedBodiesReceivedInAnyOrder("message-0", "message-1",
"message-2", "message-3", "message-4");
to.expectedHeaderValuesReceivedInAnyOrder(KafkaConstants.LAST_RECORD_BEFORE_COMMIT,
null, null, null, null, null);
- Awaitility.await().atMost(1, TimeUnit.HOURS).untilAsserted(() ->
Assert.assertEquals(MESSAGE_COUNT, receivedMessages));
+ Awaitility.await().atMost(1, TimeUnit.HOURS)
+ .untilAsserted(() -> Assertions.assertEquals(MESSAGE_COUNT,
receivedMessages));
to.assertIsSatisfied();
}
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/common/KafkaAdminUtil.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/common/KafkaAdminUtil.java
index 62083957a418..1016961686a8 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/common/KafkaAdminUtil.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/common/KafkaAdminUtil.java
@@ -31,9 +31,7 @@ import org.apache.kafka.clients.admin.AdminClientConfig;
import org.apache.kafka.clients.admin.ConsumerGroupDescription;
import org.apache.kafka.clients.admin.KafkaAdminClient;
import org.apache.kafka.common.config.SaslConfigs;
-import org.junit.Assert;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import org.junit.jupiter.api.Assertions;
public final class KafkaAdminUtil {
@@ -55,12 +53,12 @@ public final class KafkaAdminUtil {
public static void assertGroupIsConnected(String groupId, AdminClient
kafkaAdminClient) {
final Map<String, ConsumerGroupDescription> allGroups
- = assertDoesNotThrow(() -> getConsumerGroupInfo(groupId,
kafkaAdminClient));
+ = Assertions.assertDoesNotThrow(() ->
getConsumerGroupInfo(groupId, kafkaAdminClient));
- Assert.assertTrue("There should be at least one group named" +
groupId, allGroups.size() >= 1);
+ Assertions.assertTrue(allGroups.size() >= 1, "There should be at least
one group named" + groupId);
final ConsumerGroupDescription groupInfo =
allGroups.get("KafkaConsumerAuthIT");
- Assert.assertNotNull("There should be at least one group named
KafkaConsumerAuthIT", groupInfo);
+ Assertions.assertNotNull(groupInfo, "There should be at least one
group named KafkaConsumerAuthIT");
}
public static AdminClient createAuthAdminClient(KafkaService service) {
diff --git
a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
index 978fa5e68193..5da4ab14a35b 100644
---
a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
+++
b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
@@ -41,8 +41,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
import static
org.apache.camel.component.minio.MinioTestUtils.countObjectsInBucket;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static
org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
class MinioListObjectsOperationIT extends MinioIntegrationTestSupport {
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
index a002158e60dc..1231f66dbc30 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbConversionsIT.java
@@ -35,9 +35,9 @@ import org.junit.jupiter.api.Test;
import static com.mongodb.client.model.Filters.eq;
import static org.apache.camel.component.mongodb.MongoDbConstants.MONGO_ID;
-import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class MongoDbConversionsIT extends AbstractMongoDbITSupport implements
ConfigurableRoute {
diff --git
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
index 7fa4e6aff6cb..0e03bac398d4 100644
---
a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
+++
b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/integration/MongoDbTypeConvertersTest.java
@@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java
index 30f94f20e0f1..1eb10d9bae52 100644
---
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java
+++
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsSplitServersMultiprotocolTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.nats;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -28,7 +28,7 @@ public class NatsSplitServersMultiprotocolTest {
NatsConfiguration conf = new NatsConfiguration();
conf.setServers("nats://localhost:1234,localhost:6574,ws://localhost:2134");
String serv = conf.splitServers();
- Assert.assertEquals(serv,
"nats://localhost:1234,nats://localhost:6574,ws://localhost:2134");
+ Assertions.assertEquals(serv,
"nats://localhost:1234,nats://localhost:6574,ws://localhost:2134");
}
@Test
@@ -36,7 +36,7 @@ public class NatsSplitServersMultiprotocolTest {
NatsConfiguration conf = new NatsConfiguration();
conf.setServers("wss://localhost:1234,wss://localhost:6574,wss://localhost:2134");
String serv = conf.splitServers();
- Assert.assertEquals(serv,
"wss://localhost:1234,wss://localhost:6574,wss://localhost:2134");
+ Assertions.assertEquals(serv,
"wss://localhost:1234,wss://localhost:6574,wss://localhost:2134");
}
@Test
@@ -44,7 +44,7 @@ public class NatsSplitServersMultiprotocolTest {
NatsConfiguration conf = new NatsConfiguration();
conf.setServers("ws://localhost:1234,ws://localhost:6574,ws://localhost:2134");
String serv = conf.splitServers();
- Assert.assertEquals(serv,
"ws://localhost:1234,ws://localhost:6574,ws://localhost:2134");
+ Assertions.assertEquals(serv,
"ws://localhost:1234,ws://localhost:6574,ws://localhost:2134");
}
@Test
@@ -52,6 +52,6 @@ public class NatsSplitServersMultiprotocolTest {
NatsConfiguration conf = new NatsConfiguration();
conf.setServers("localhost:1234,localhost:6574,localhost:2134");
String serv = conf.splitServers();
- Assert.assertEquals(serv,
"nats://localhost:1234,nats://localhost:6574,nats://localhost:2134");
+ Assertions.assertEquals(serv,
"nats://localhost:1234,nats://localhost:6574,nats://localhost:2134");
}
}
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index 6d9c6369e916..9e1ba86ac259 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
+ <artifactId>testcontainers-postgresql</artifactId>
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java
index f9d56dfc0053..51782a76cc0a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesManualIT.java
@@ -19,11 +19,11 @@ package org.apache.camel.component.salesforce;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
import org.apache.camel.component.salesforce.dto.generated.Account;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -91,7 +91,7 @@ public class CompoundTypesManualIT extends
AbstractSalesforceTestBase {
} finally {
// delete the test SObject
String id = (String) template().requestBody("direct:deleteSObject"
+ suffix, result.getId());
- assertEquals(id, result.getId());
+ Assertions.assertEquals(id, result.getId());
LOG.debug("Delete successful");
}
}
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiTest.java
index b328ec8a520e..effd026f2eeb 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/PubSubApiTest.java
@@ -30,6 +30,7 @@ import
org.apache.camel.component.salesforce.internal.pubsub.AuthErrorPubSubServ
import
org.apache.camel.component.salesforce.internal.pubsub.SendInvalidReplayIdErrorPubSubServer;
import
org.apache.camel.component.salesforce.internal.pubsub.SendOneMessagePubSubServer;
import org.apache.camel.spi.ExceptionHandler;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
@@ -37,7 +38,6 @@ import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -209,7 +209,7 @@ public class PubSubApiTest {
ArgumentCaptor<InvalidReplayIdException> captor =
ArgumentCaptor.forClass(InvalidReplayIdException.class);
verify(exceptionHandler,
timeout(5000).times(3)).handleException(captor.capture());
for (InvalidReplayIdException exception : captor.getAllValues()) {
- assertEquals(replayId, exception.getReplayId());
+ Assertions.assertEquals(replayId, exception.getReplayId());
}
}
diff --git
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
index 56fbfb672ca7..4a0d4bee1b3d 100644
---
a/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
+++
b/components/camel-smb/src/test/java/org/apache/camel/component/smb/SmbComponentConnectionIT.java
@@ -30,7 +30,7 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.infra.smb.services.SmbService;
import org.apache.camel.test.infra.smb.services.SmbServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
@@ -64,7 +64,7 @@ public class SmbComponentConnectionIT extends
CamelTestSupport {
mock.assertIsSatisfied();
SmbFile file =
mock.getExchanges().get(0).getIn().getBody(SmbFile.class);
- Assert.assertEquals("Hello World", new String((byte[]) file.getBody(),
StandardCharsets.UTF_8));
+ Assertions.assertEquals("Hello World", new String((byte[])
file.getBody(), StandardCharsets.UTF_8));
}
@Test
@@ -79,7 +79,7 @@ public class SmbComponentConnectionIT extends
CamelTestSupport {
mock.assertIsSatisfied();
SmbFile file =
mock.getExchanges().get(0).getIn().getBody(SmbFile.class);
- Assert.assertEquals("Hello World", new String((byte[]) file.getBody(),
StandardCharsets.UTF_8));
+ Assertions.assertEquals("Hello World", new String((byte[])
file.getBody(), StandardCharsets.UTF_8));
}
@Test
@@ -93,7 +93,7 @@ public class SmbComponentConnectionIT extends
CamelTestSupport {
mock.assertIsSatisfied();
SmbFile file =
mock.getExchanges().get(0).getIn().getBody(SmbFile.class);
- Assert.assertEquals("Good Bye", new String((byte[]) file.getBody(),
StandardCharsets.UTF_8));
+ Assertions.assertEquals("Good Bye", new String((byte[])
file.getBody(), StandardCharsets.UTF_8));
}
@Override
diff --git a/components/camel-zeebe/pom.xml b/components/camel-zeebe/pom.xml
index 0997fdd880fb..a4fcfefaef61 100644
--- a/components/camel-zeebe/pom.xml
+++ b/components/camel-zeebe/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_17.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_17.adoc
index b885b9ff1eff..ce8a67ded6a0 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_17.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_17.adoc
@@ -33,3 +33,7 @@ Disabling virtual threads by setting system property
`org.infinispan.threads.vir
=== Component deprecation
The `camel-stomp` component is deprecated.
+
+=== TestContainers updated to 2.0.2
+
+TestContainers (TC) is updated to 2.0.2, see the
https://github.com/testcontainers/testcontainers-java/releases[TC release notes
since 2.0.0] and CAMEL-22720, noteworthy are: Removed JUnit 4 support, All
modules are now prefixed with testcontainers-. For example,
org.testcontainers:mysql is now org.testcontainers:testcontainers-mysql. Update
docker image version to 25.0.5. Set default docker API version to 1.44.
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/InVersion.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/InVersion.java
index 703f657a1250..9b7fa7e94595 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/InVersion.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/InVersion.java
@@ -22,13 +22,13 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.camel.dsl.jbang.core.common.VersionHelper;
+import org.apache.camel.util.ObjectHelper;
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
import org.junit.jupiter.api.extension.ExecutionCondition;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
import static org.apache.camel.util.StringHelper.sanitize;
@@ -62,13 +62,13 @@ public @interface InVersion {
return Boolean.FALSE;
}
}
- if (StringUtils.isNotBlank(annotation.from()) &&
StringUtils.isNotBlank(annotation.to())) {
+ if (ObjectHelper.isNotEmpty(annotation.from()) &&
ObjectHelper.isNotEmpty(annotation.to())) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("from={},to={},{}",
sanitize(annotation.from()), annotation.to(),
VersionHelper.isBetween(currTestClass.version(), annotation.from(),
annotation.to()));
}
return
VersionHelper.isBetween(currTestClass.version(), annotation.from(),
annotation.to());
- } else if (StringUtils.isNotBlank(annotation.from())) {
+ } else if (ObjectHelper.isNotEmpty(annotation.from()))
{
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("from={},{}", annotation.from(),
VersionHelper.isGE(currTestClass.version(), annotation.from()));
diff --git
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
index 647763ccfc74..9be9ed567e30 100644
---
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
+++
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/support/JBangTestSupport.java
@@ -44,6 +44,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.test.infra.cli.common.CliProperties;
import org.apache.camel.test.infra.cli.services.CliService;
import org.apache.camel.test.infra.cli.services.CliServiceFactory;
+import org.apache.commons.io.FileUtils;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
@@ -52,7 +53,6 @@ import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
public abstract class JBangTestSupport {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/resources/docker-java.properties
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/resources/docker-java.properties
deleted file mode 100644
index 54ee16b0d9cc..000000000000
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/resources/docker-java.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-api.version=1.44
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index f1191e722c68..101824a59386 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -517,7 +517,7 @@
<stax-api-version>1.0.1</stax-api-version>
<stringtemplate-version>4.3.4</stringtemplate-version>
<tahu-version>1.0.17</tahu-version>
- <testcontainers-version>1.21.3</testcontainers-version>
+ <testcontainers-version>2.0.2</testcontainers-version>
<thymeleaf-version>3.1.3.RELEASE</thymeleaf-version>
<tika-version>2.9.4</tika-version>
<twilio-version>11.1.0</twilio-version>
diff --git a/test-infra/camel-test-infra-cassandra/pom.xml
b/test-infra/camel-test-infra-cassandra/pom.xml
index b13252e9782b..1ac388cc8cd0 100644
--- a/test-infra/camel-test-infra-cassandra/pom.xml
+++ b/test-infra/camel-test-infra-cassandra/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>cassandra</artifactId>
+ <artifactId>testcontainers-cassandra</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-cli/pom.xml
b/test-infra/camel-test-infra-cli/pom.xml
index f741a912cc39..07f8ea1b85aa 100644
--- a/test-infra/camel-test-infra-cli/pom.xml
+++ b/test-infra/camel-test-infra-cli/pom.xml
@@ -24,16 +24,16 @@
<relativePath>../camel-test-infra-parent/pom.xml</relativePath>
<version>4.17.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<artifactId>camel-test-infra-cli</artifactId>
<name>Camel :: Test Infra :: Cli (Camel JBang)</name>
<properties>
<maven.test.skip>false</maven.test.skip>
</properties>
-
+
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -46,7 +46,17 @@
<artifactId>camel-test-infra-common</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
index 702e393929e4..0ddafdaa82e4 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/it/RunITCase.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.test.infra.cli.it;
+import org.apache.camel.support.ObjectHelper;
import org.apache.camel.test.infra.cli.services.CliService;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -23,7 +24,6 @@ import
org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import org.junitpioneer.jupiter.ReadsSystemProperty;
import org.junitpioneer.jupiter.RestoreSystemProperties;
import org.junitpioneer.jupiter.SetSystemProperty;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
@RestoreSystemProperties
public class RunITCase extends AbstractTestSupport {
@@ -48,6 +48,6 @@ public class RunITCase extends AbstractTestSupport {
private void checkPidFromBackgroundExec(CliService cliService) {
cliService.execute("init foo.yaml");
String pid = cliService.executeBackground("run foo.yaml");
- Assertions.assertTrue(StringUtils.isNumeric(pid), "pid is numeric: " +
pid);
+ Assertions.assertTrue(ObjectHelper.isNumber(pid), "pid is numeric: " +
pid);
}
}
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
index 5c342d06dc0e..265a27c6e614 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
@@ -26,11 +26,12 @@ import java.util.stream.Stream;
import org.apache.camel.test.infra.cli.common.CliProperties;
import org.apache.camel.test.infra.common.services.ContainerService;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
-import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
public class CliLocalContainerService implements CliService,
ContainerService<CliBuiltContainer> {
public static final String CONTAINER_NAME = "camel-cli";
@@ -77,11 +78,11 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
registerProperties();
LOG.info("{} instance running", CONTAINER_NAME);
- if (StringUtils.isNotBlank(forceToRunVersion)) {
+ if (ObjectHelper.isNotEmpty(forceToRunVersion)) {
LOG.info("force to use version {}", forceToRunVersion);
execute("version set " + forceToRunVersion);
}
- if (StringUtils.isNotBlank(mavenRepos)) {
+ if (ObjectHelper.isNotEmpty(mavenRepos)) {
LOG.info("set repositories {}", mavenRepos);
execute(String.format("config set repos=%s", mavenRepos));
}
@@ -117,8 +118,8 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
@Override
public String executeBackground(String command) {
- final String pid = StringUtils.substringAfter(execute(command.concat("
--background")), "PID:").trim();
- return StringUtils.isNumeric(pid) ? pid :
StringUtils.substringBefore(pid, " ");
+ final String pid = StringHelper.after(execute(command.concat("
--background")), "PID:").trim();
+ return org.apache.camel.support.ObjectHelper.isNumber(pid) ? pid :
StringHelper.before(pid, " ");
}
@Override
@@ -131,10 +132,10 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
execResult.getStderr()));
}
if (LOG.isDebugEnabled()) {
- if (StringUtils.isNotBlank(execResult.getStdout())) {
+ if (ObjectHelper.isNotEmpty(execResult.getStdout())) {
LOG.debug("result out {}", execResult.getStdout());
}
- if (StringUtils.isNotBlank(execResult.getStderr())) {
+ if (ObjectHelper.isNotEmpty(execResult.getStderr())) {
LOG.debug("result error {}", execResult.getStderr());
}
}
@@ -195,10 +196,10 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
.orElseGet(() -> {
final String versionSummary = execute("version");
if (versionSummary.contains("User configuration") &&
versionSummary.contains("camel-version = ")) {
- version = StringUtils.substringBetween(versionSummary,
"camel-version = ", "\n").trim();
+ version = StringHelper.between(versionSummary,
"camel-version = ", "\n").trim();
}
if (version == null) {
- version = StringUtils.substringBetween(versionSummary,
"Camel JBang version:", "\n").trim();
+ version = StringHelper.between(versionSummary, "Camel
JBang version:", "\n").trim();
}
return version;
});
diff --git a/test-infra/camel-test-infra-couchbase/pom.xml
b/test-infra/camel-test-infra-couchbase/pom.xml
index 09c8348a26d7..6610e863c279 100644
--- a/test-infra/camel-test-infra-couchbase/pom.xml
+++ b/test-infra/camel-test-infra-couchbase/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>couchbase</artifactId>
+ <artifactId>testcontainers-couchbase</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-elasticsearch/pom.xml
b/test-infra/camel-test-infra-elasticsearch/pom.xml
index d30962b34240..628e9c7688d9 100644
--- a/test-infra/camel-test-infra-elasticsearch/pom.xml
+++ b/test-infra/camel-test-infra-elasticsearch/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>elasticsearch</artifactId>
+ <artifactId>testcontainers-elasticsearch</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-google-pubsub/pom.xml
b/test-infra/camel-test-infra-google-pubsub/pom.xml
index 43637f8959cf..bb54e3e8e522 100644
--- a/test-infra/camel-test-infra-google-pubsub/pom.xml
+++ b/test-infra/camel-test-infra-google-pubsub/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>gcloud</artifactId>
+ <artifactId>testcontainers-gcloud</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-hivemq/pom.xml
b/test-infra/camel-test-infra-hivemq/pom.xml
index 59c94bcf31b5..6b06efca85df 100644
--- a/test-infra/camel-test-infra-hivemq/pom.xml
+++ b/test-infra/camel-test-infra-hivemq/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>hivemq</artifactId>
+ <artifactId>testcontainers-hivemq</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-jdbc/pom.xml
b/test-infra/camel-test-infra-jdbc/pom.xml
index 3ae9b285ffc2..ffcdfa8e8f7a 100644
--- a/test-infra/camel-test-infra-jdbc/pom.xml
+++ b/test-infra/camel-test-infra-jdbc/pom.xml
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>jdbc</artifactId>
+ <artifactId>testcontainers-jdbc</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-kafka/pom.xml
b/test-infra/camel-test-infra-kafka/pom.xml
index d214c9f98fde..9e623faa1832 100644
--- a/test-infra/camel-test-infra-kafka/pom.xml
+++ b/test-infra/camel-test-infra-kafka/pom.xml
@@ -51,12 +51,12 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>kafka</artifactId>
+ <artifactId>testcontainers-kafka</artifactId>
<version>${testcontainers-version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>redpanda</artifactId>
+ <artifactId>testcontainers-redpanda</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-milvus/pom.xml
b/test-infra/camel-test-infra-milvus/pom.xml
index 684c08e2cd9c..7888bd9c8b6e 100644
--- a/test-infra/camel-test-infra-milvus/pom.xml
+++ b/test-infra/camel-test-infra-milvus/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>milvus</artifactId>
+ <artifactId>testcontainers-milvus</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-mongodb/pom.xml
b/test-infra/camel-test-infra-mongodb/pom.xml
index 3ca02f314bb4..3eddd543b020 100644
--- a/test-infra/camel-test-infra-mongodb/pom.xml
+++ b/test-infra/camel-test-infra-mongodb/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>mongodb</artifactId>
+ <artifactId>testcontainers-mongodb</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-neo4j/pom.xml
b/test-infra/camel-test-infra-neo4j/pom.xml
index 2e55ea128cc5..a2d88a8fbddf 100644
--- a/test-infra/camel-test-infra-neo4j/pom.xml
+++ b/test-infra/camel-test-infra-neo4j/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>neo4j</artifactId>
+ <artifactId>testcontainers-neo4j</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-ollama/pom.xml
b/test-infra/camel-test-infra-ollama/pom.xml
index 90ad30686298..dc7af9981bb8 100644
--- a/test-infra/camel-test-infra-ollama/pom.xml
+++ b/test-infra/camel-test-infra-ollama/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>ollama</artifactId>
+ <artifactId>testcontainers-ollama</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-parent/pom.xml
b/test-infra/camel-test-infra-parent/pom.xml
index 4a8e55f02be3..2a0361676a8d 100644
--- a/test-infra/camel-test-infra-parent/pom.xml
+++ b/test-infra/camel-test-infra-parent/pom.xml
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>junit-jupiter</artifactId>
+ <artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers-version}</version>
<scope>test</scope>
</dependency>
diff --git a/test-infra/camel-test-infra-pinecone/pom.xml
b/test-infra/camel-test-infra-pinecone/pom.xml
index 8ba4489568f5..26ec3acb7d5a 100644
--- a/test-infra/camel-test-infra-pinecone/pom.xml
+++ b/test-infra/camel-test-infra-pinecone/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>pinecone</artifactId>
+ <artifactId>testcontainers-pinecone</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-postgres/pom.xml
b/test-infra/camel-test-infra-postgres/pom.xml
index 3e5bd6ab4ca5..86e1fbd9fceb 100644
--- a/test-infra/camel-test-infra-postgres/pom.xml
+++ b/test-infra/camel-test-infra-postgres/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>postgresql</artifactId>
+ <artifactId>testcontainers-postgresql</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-pulsar/pom.xml
b/test-infra/camel-test-infra-pulsar/pom.xml
index 3c0296bf4c08..772fd6fbaf92 100644
--- a/test-infra/camel-test-infra-pulsar/pom.xml
+++ b/test-infra/camel-test-infra-pulsar/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>pulsar</artifactId>
+ <artifactId>testcontainers-pulsar</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-qdrant/pom.xml
b/test-infra/camel-test-infra-qdrant/pom.xml
index e100e4c1dcfc..dd87329e4a99 100644
--- a/test-infra/camel-test-infra-qdrant/pom.xml
+++ b/test-infra/camel-test-infra-qdrant/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>qdrant</artifactId>
+ <artifactId>testcontainers-qdrant</artifactId>
<version>${testcontainers-version}</version>
</dependency>
diff --git a/test-infra/camel-test-infra-rabbitmq/pom.xml
b/test-infra/camel-test-infra-rabbitmq/pom.xml
index 9f14dd086e25..0cf9ae298334 100644
--- a/test-infra/camel-test-infra-rabbitmq/pom.xml
+++ b/test-infra/camel-test-infra-rabbitmq/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>rabbitmq</artifactId>
+ <artifactId>testcontainers-rabbitmq</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
diff --git a/test-infra/camel-test-infra-weaviate/pom.xml
b/test-infra/camel-test-infra-weaviate/pom.xml
index bb7f375d9c2a..fdf60ed8d0b3 100644
--- a/test-infra/camel-test-infra-weaviate/pom.xml
+++ b/test-infra/camel-test-infra-weaviate/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
- <artifactId>weaviate</artifactId>
+ <artifactId>testcontainers-weaviate</artifactId>
<version>${testcontainers-version}</version>
</dependency>
</dependencies>
