This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1af32b5dd4f85eb724122ea73eb77be2ab3bba7b Author: James Netherton <[email protected]> AuthorDate: Thu Nov 13 07:30:36 2025 +0000 Upgrade Quarkus to 3.31.0.CR1 --- .../deployment/SupportMongoDBProcessor.java | 4 +- extensions/infinispan/runtime/pom.xml | 11 ------ .../it/AwsSecretsManagerTestEnvCustomizer.java | 2 +- .../manager/it/CamelContextSqsReloadTest.java | 4 +- .../quarkus/component/aws2/cw/it/Aws2CwTest.java | 2 +- .../aws2/cw/it/Aws2CwTestEnvCustomizer.java | 2 +- .../aws2/ddb/it/Aws2DdbTestEnvCustomizer.java | 2 +- .../aws2/kinesis/it/Aws2KinesisFirehoseTest.java | 2 +- .../component/aws2/kinesis/it/Aws2KinesisTest.java | 2 +- .../kinesis/it/Aws2KinesisTestEnvCustomizer.java | 2 +- .../lambda/it/Aws2LambdaTestEnvCustomizer.java | 2 +- .../aws2/s3/it/Aws2S3TestEnvCustomizer.java | 2 +- .../quarkus/component/aws2/ses/it/Aws2SesTest.java | 2 +- .../aws2/ses/it/Aws2SesTestEnvCustomizer.java | 2 +- .../aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java | 2 +- .../aws2/sqs/it/Aws2SqsTestEnvCustomizer.java | 2 +- integration-test-groups/debezium/mongodb/pom.xml | 13 +------ integration-test-groups/debezium/mssql/pom.xml | 13 +------ integration-test-groups/debezium/mysql/pom.xml | 13 +------ integration-test-groups/debezium/oracle/pom.xml | 14 +------ .../debezium/postgresql/pom.xml | 17 +------- integration-tests-jvm/couchbase/pom.xml | 13 +------ integration-tests-support/activemq/pom.xml | 10 ----- integration-tests-support/aws2/pom.xml | 34 +--------------- .../quarkus/test/support/aws2/Aws2Client.java | 2 - .../test/support/aws2/Aws2TestEnvContext.java | 7 ++-- .../test/support/aws2/Aws2TestEnvCustomizer.java | 2 - .../test/support/aws2/Aws2TestResource.java | 17 ++++---- .../support/aws2/{Aws2Client.java => Service.java} | 43 ++++++++++++++------- integration-tests-support/azure/pom.xml | 8 ---- integration-tests-support/debezium/pom.xml | 12 +----- integration-tests-support/google/pom.xml | 16 +------- integration-tests-support/kafka/pom.xml | 10 ----- integration-tests-support/mongodb/pom.xml | 10 ----- integration-tests-support/splunk/pom.xml | 10 ----- integration-tests/cassandraql/pom.xml | 11 +----- integration-tests/debezium-grouped/pom.xml | 45 +++------------------- .../langchain4j-embeddingstore/pom.xml | 13 +------ integration-tests/pinecone/pom.xml | 13 +------ integration-tests/qdrant/pom.xml | 13 +------ integration-tests/solr/pom.xml | 13 +------ integration-tests/spring-rabbitmq/pom.xml | 13 +------ integration-tests/weaviate/pom.xml | 13 +------ pom.xml | 10 ++--- poms/bom/src/main/generated/flattened-full-pom.xml | 6 +-- .../src/main/generated/flattened-reduced-pom.xml | 6 +-- .../generated/flattened-reduced-verbose-pom.xml | 6 +-- 47 files changed, 93 insertions(+), 378 deletions(-) diff --git a/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java b/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java index f7f8aedd69..ea4991f715 100644 --- a/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java +++ b/extensions-support/mongodb/deployment/src/main/java/org/apache/camel/quarkus/support/mongodb/deployment/SupportMongoDBProcessor.java @@ -21,7 +21,7 @@ import java.util.List; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.mongodb.deployment.MongoClientBuildItem; -import io.quarkus.mongodb.runtime.MongoClientBeanUtil; +import io.quarkus.mongodb.runtime.MongoConfig; import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; class SupportMongoDBProcessor { @@ -43,7 +43,7 @@ class SupportMongoDBProcessor { private String getMongoClientName(String clientName) { // Use the default mongo client instance name if it is the default connection - return MongoClientBeanUtil.isDefault(clientName) ? "camelMongoClient" : clientName; + return MongoConfig.isDefaultClient(clientName) ? "camelMongoClient" : clientName; } } diff --git a/extensions/infinispan/runtime/pom.xml b/extensions/infinispan/runtime/pom.xml index 9fd1affd34..05684ad3c9 100644 --- a/extensions/infinispan/runtime/pom.xml +++ b/extensions/infinispan/runtime/pom.xml @@ -46,17 +46,6 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-jaxb</artifactId> </dependency> - <dependency> - <groupId>org.infinispan</groupId> - <artifactId>infinispan-remote-query-client</artifactId> - <exclusions> - <exclusion> - <groupId>io.reactivex.rxjava3</groupId> - <artifactId>rxjava</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-infinispan</artifactId> diff --git a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java index 37ab7a9b7c..e79b4f5fc1 100644 --- a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.model.CreateQueueRequest; import software.amazon.awssdk.services.sqs.model.DeleteQueueRequest; diff --git a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java index 57e07c4f84..7db1ae05e1 100644 --- a/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java +++ b/integration-test-groups/aws2/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/CamelContextSqsReloadTest.java @@ -30,11 +30,11 @@ import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants; import org.apache.camel.component.aws.secretsmanager.SecretsManagerOperations; import org.apache.camel.quarkus.test.support.aws2.Aws2Client; import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.awaitility.Awaitility; import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.localstack.LocalStackContainer; import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.model.SendMessageRequest; import software.amazon.awssdk.services.sqs.model.SendMessageResponse; @@ -59,7 +59,7 @@ public class CamelContextSqsReloadTest { "}"; } - @Aws2Client(LocalStackContainer.Service.SQS) + @Aws2Client(Service.SQS) SqsClient sqsClient; @Test diff --git a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java index 2b2bb26697..6db3782a1d 100644 --- a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java +++ b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTest.java @@ -30,11 +30,11 @@ import org.apache.camel.component.aws2.cw.Cw2Constants; import org.apache.camel.quarkus.test.support.aws2.Aws2Client; import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.camel.util.CollectionHelper; import org.awaitility.Awaitility; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.cloudwatch.CloudWatchClient; import software.amazon.awssdk.services.cloudwatch.model.Datapoint; import software.amazon.awssdk.services.cloudwatch.model.Dimension; diff --git a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTestEnvCustomizer.java index 687182467c..3b31b5f6bf 100644 --- a/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-cw/src/test/java/org/apache/camel/quarkus/component/aws2/cw/it/Aws2CwTestEnvCustomizer.java @@ -18,7 +18,7 @@ package org.apache.camel.quarkus.component.aws2.cw.it; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; +import org.apache.camel.quarkus.test.support.aws2.Service; public class Aws2CwTestEnvCustomizer implements Aws2TestEnvCustomizer { diff --git a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java index 3718d1fa27..4cc590df79 100644 --- a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbTestEnvCustomizer.java @@ -23,8 +23,8 @@ import java.util.stream.Stream; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.dynamodb.DynamoDbClient; import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition; import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest; diff --git a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java index 64f4054936..19d81a23f5 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisFirehoseTest.java @@ -27,13 +27,13 @@ import io.restassured.http.ContentType; import org.apache.camel.quarkus.test.support.aws2.Aws2Client; import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; import org.awaitility.Awaitility; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.core.ResponseInputStream; import software.amazon.awssdk.services.s3.S3Client; import software.amazon.awssdk.services.s3.model.GetObjectRequest; diff --git a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java index eec929833e..5c429defe1 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java @@ -25,9 +25,9 @@ import io.restassured.http.ContentType; import org.apache.camel.quarkus.test.support.aws2.Aws2Client; import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.awaitility.Awaitility; import org.jboss.logging.Logger; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.s3.S3Client; @QuarkusTest diff --git a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java index b12bf7012d..5638d55eee 100644 --- a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTestEnvCustomizer.java @@ -22,10 +22,10 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; import org.awaitility.Awaitility; import org.jboss.logging.Logger; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.firehose.FirehoseClient; import software.amazon.awssdk.services.firehose.model.BufferingHints; import software.amazon.awssdk.services.firehose.model.CreateDeliveryStreamRequest; diff --git a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java index a9bc4bec72..8b0ccd497e 100644 --- a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTestEnvCustomizer.java @@ -20,8 +20,8 @@ import java.util.Locale; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.iam.IamClient; import software.amazon.awssdk.services.iam.model.AttachRolePolicyRequest; import software.amazon.awssdk.services.iam.model.CreateRoleRequest; diff --git a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java index 468f6a7f54..be0344f568 100644 --- a/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3TestEnvCustomizer.java @@ -20,8 +20,8 @@ import java.util.Locale; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.kms.KmsClient; import software.amazon.awssdk.services.kms.model.CreateKeyRequest; import software.amazon.awssdk.services.s3.S3Client; diff --git a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java index 84e8d37ce8..3d6454c94d 100644 --- a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java +++ b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTest.java @@ -34,6 +34,7 @@ import io.restassured.response.Response; import org.apache.camel.quarkus.test.support.aws2.Aws2Client; import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource; import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; import org.awaitility.Awaitility; import org.eclipse.microprofile.config.Config; @@ -44,7 +45,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.ses.SesClient; import software.amazon.awssdk.services.ses.model.DeleteVerifiedEmailAddressRequest; import software.amazon.awssdk.services.ses.model.VerifyEmailAddressRequest; diff --git a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTestEnvCustomizer.java index 88dfbacfc6..ee365f219a 100644 --- a/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesTestEnvCustomizer.java @@ -18,7 +18,7 @@ package org.apache.camel.quarkus.component.aws2.ses.it; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; +import org.apache.camel.quarkus.test.support.aws2.Service; public class Aws2SesTestEnvCustomizer implements Aws2TestEnvCustomizer { diff --git a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java index 25ee03e269..28566ac1a6 100644 --- a/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SqsSnsTestEnvCustomizer.java @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.sns.SnsClient; import software.amazon.awssdk.services.sns.model.CreateTopicRequest; import software.amazon.awssdk.services.sns.model.DeleteTopicRequest; diff --git a/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java b/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java index 1039bdbc88..48e92beae2 100644 --- a/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java +++ b/integration-test-groups/aws2/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsTestEnvCustomizer.java @@ -20,8 +20,8 @@ import java.util.Locale; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext; import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer; +import org.apache.camel.quarkus.test.support.aws2.Service; import org.apache.commons.lang3.RandomStringUtils; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.model.CreateQueueRequest; import software.amazon.awssdk.services.sqs.model.DeleteQueueRequest; diff --git a/integration-test-groups/debezium/mongodb/pom.xml b/integration-test-groups/debezium/mongodb/pom.xml index 805c8a9e6b..19f6b366b7 100644 --- a/integration-test-groups/debezium/mongodb/pom.xml +++ b/integration-test-groups/debezium/mongodb/pom.xml @@ -69,25 +69,14 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>mongodb</artifactId> + <artifactId>testcontainers-mongodb</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-integration-tests-support-mongodb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> diff --git a/integration-test-groups/debezium/mssql/pom.xml b/integration-test-groups/debezium/mssql/pom.xml index 9ff3b6100b..b134f0ae2d 100644 --- a/integration-test-groups/debezium/mssql/pom.xml +++ b/integration-test-groups/debezium/mssql/pom.xml @@ -73,25 +73,14 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>mssqlserver</artifactId> + <artifactId>testcontainers-mssqlserver</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-integration-tests-support-mongodb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> diff --git a/integration-test-groups/debezium/mysql/pom.xml b/integration-test-groups/debezium/mysql/pom.xml index e2fd55e795..fbb91cb694 100644 --- a/integration-test-groups/debezium/mysql/pom.xml +++ b/integration-test-groups/debezium/mysql/pom.xml @@ -74,25 +74,14 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>mysql</artifactId> + <artifactId>testcontainers-mysql</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-integration-tests-support-mongodb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> diff --git a/integration-test-groups/debezium/oracle/pom.xml b/integration-test-groups/debezium/oracle/pom.xml index 7225d3673e..049e9a4e70 100644 --- a/integration-test-groups/debezium/oracle/pom.xml +++ b/integration-test-groups/debezium/oracle/pom.xml @@ -80,19 +80,7 @@ <dependency> <groupId>org.testcontainers</groupId> - <artifactId>oracle-xe</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-oracle-xe</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-test-groups/debezium/postgresql/pom.xml b/integration-test-groups/debezium/postgresql/pom.xml index d94a70cb0a..6fc401be0a 100644 --- a/integration-test-groups/debezium/postgresql/pom.xml +++ b/integration-test-groups/debezium/postgresql/pom.xml @@ -31,10 +31,6 @@ <name>Camel Quarkus :: Integration Tests :: Debezium Postgresql</name> <description>Integration tests for Debezium - Postgresql Database</description> - - - - <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId> @@ -79,21 +75,10 @@ <dependency> <groupId>org.testcontainers</groupId> - <artifactId>postgresql</artifactId> + <artifactId>testcontainers-postgresql</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> diff --git a/integration-tests-jvm/couchbase/pom.xml b/integration-tests-jvm/couchbase/pom.xml index 30939e6cec..760ffaf5a1 100644 --- a/integration-tests-jvm/couchbase/pom.xml +++ b/integration-tests-jvm/couchbase/pom.xml @@ -53,18 +53,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>couchbase</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-couchbase</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests-support/activemq/pom.xml b/integration-tests-support/activemq/pom.xml index 334e5eec5d..942fdf4074 100644 --- a/integration-tests-support/activemq/pom.xml +++ b/integration-tests-support/activemq/pom.xml @@ -37,16 +37,6 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> </dependency> <dependency> <groupId>io.quarkiverse.artemis</groupId> diff --git a/integration-tests-support/aws2/pom.xml b/integration-tests-support/aws2/pom.xml index 3786e68a84..4b6891f6b8 100644 --- a/integration-tests-support/aws2/pom.xml +++ b/integration-tests-support/aws2/pom.xml @@ -53,12 +53,6 @@ <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-core</artifactId> - <exclusions> - <exclusion> - <artifactId>sdk-core</artifactId> - <groupId>software.amazon.awssdk</groupId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> @@ -71,40 +65,14 @@ <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-integration-test-support</artifactId> - <!-- Dependency should be excluded when this module us used a compile dependency and a test-jar dependency os also present.--> </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>localstack</artifactId> - <!-- Dependency should be excluded when this module us used a compile dependency and a test-jar dependency os also present.--> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - <!-- Dependency should be excluded when this module us used a compile dependency and a test-jar dependency os also present.--> + <artifactId>testcontainers-localstack</artifactId> </dependency> <dependency> <groupId>io.rest-assured</groupId> <artifactId>rest-assured</artifactId> - <!-- Dependency should be excluded when this module us used a compile dependency and a test-jar dependency os also present.--> </dependency> - <dependency><!-- Workaround for https://github.com/testcontainers/testcontainers-java/issues/1442 --> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-core</artifactId> - <!-- Dependency should be excluded when this module us used a compile dependency and a test-jar dependency os also present.--> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> </project> \ No newline at end of file diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java index fcebaa3ca7..4fb2f48d26 100644 --- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java +++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java @@ -21,8 +21,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Aws2Client { diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java index ddb96d2eba..7a5ffc71d4 100644 --- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java +++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvContext.java @@ -30,8 +30,7 @@ import java.util.Optional; import java.util.function.Supplier; import org.jboss.logging.Logger; -import org.testcontainers.containers.localstack.LocalStackContainer; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; +import org.testcontainers.localstack.LocalStackContainer; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; @@ -80,7 +79,7 @@ public class Aws2TestEnvContext { properties.put(s + ".override-endpoint", "true"); properties.put(s + ".uri-endpoint-override", - ls.getEndpointOverride(service).toString()); + ls.getEndpoint().toString()); } } }); @@ -183,7 +182,7 @@ public class Aws2TestEnvContext { if (localstack.isPresent()) { builder - .endpointOverride(localstack.get().getEndpointOverride(service)) + .endpointOverride(localstack.get().getEndpoint()) .region(Region.of(region)); } else if (service == Service.IAM) { /* Avoid UnknownHostException: iam.eu-central-1.amazonaws.com */ diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvCustomizer.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvCustomizer.java index bf073f866d..efe618d178 100644 --- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvCustomizer.java +++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestEnvCustomizer.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.test.support.aws2; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; - /** * An SPI to allow individual AWS 2 test modules to customize the {@link Aws2TestResource}. * At the same time, this SPI should allow running the AWS 2 test modules both isolated and merged together. diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java index b7d929a66d..ca9f62b566 100644 --- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java +++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2TestResource.java @@ -29,9 +29,8 @@ import org.apache.camel.quarkus.test.mock.backend.MockBackendUtils; import org.eclipse.microprofile.config.ConfigProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.localstack.LocalStackContainer; -import org.testcontainers.containers.localstack.LocalStackContainer.Service; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.localstack.LocalStackContainer; import org.testcontainers.utility.DockerImageName; import software.amazon.awssdk.core.SdkClient; @@ -40,7 +39,6 @@ public final class Aws2TestResource implements QuarkusTestResourceLifecycleManag private Aws2TestEnvContext envContext; - @SuppressWarnings("resource") @Override public Map<String, String> start() { final String realKey = System.getenv("AWS_ACCESS_KEY"); @@ -58,10 +56,10 @@ public final class Aws2TestResource implements QuarkusTestResourceLifecycleManag ServiceLoader<Aws2TestEnvCustomizer> loader = ServiceLoader.load(Aws2TestEnvCustomizer.class); List<Aws2TestEnvCustomizer> customizers = new ArrayList<>(); for (Aws2TestEnvCustomizer customizer : loader) { - LOG.info("Loaded Aws2TestEnvCustomizer " + customizer.getClass().getName()); + LOG.info("Loaded Aws2TestEnvCustomizer {}", customizer.getClass().getName()); customizers.add(customizer); } - LOG.info("Loaded " + customizers.size() + " Aws2TestEnvCustomizers"); + LOG.info("Loaded {} Aws2TestEnvCustomizers", customizers.size()); if (usingMockBackend) { MockBackendUtils.logMockBackendUsed(); @@ -70,15 +68,16 @@ public final class Aws2TestResource implements QuarkusTestResourceLifecycleManag localstackLogLevel = "info"; } - final Service[] services = customizers.stream() + final String[] services = customizers.stream() .map(Aws2TestEnvCustomizer::localstackServices) - .flatMap((Service[] ss) -> Stream.of(ss)) + .flatMap(Stream::of) .distinct() - .toArray(Service[]::new); + .map(Service::getName) + .toArray(String[]::new); final Service[] exportCredentialsServices = customizers.stream() .map(Aws2TestEnvCustomizer::exportCredentialsForLocalstackServices) - .flatMap((Service[] ss) -> Stream.of(ss)) + .flatMap(Stream::of) .distinct() .toArray(Service[]::new); diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java similarity index 53% copy from integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java copy to integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java index fcebaa3ca7..422b684295 100644 --- a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Aws2Client.java +++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/Service.java @@ -16,20 +16,37 @@ */ package org.apache.camel.quarkus.test.support.aws2; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +public enum Service { + API_GATEWAY("apigateway"), + EC2("ec2"), + KINESIS("kinesis"), + DYNAMODB("dynamodb"), + DYNAMODB_STREAMS("dynamodbstreams"), + S3("s3"), + FIREHOSE("firehose"), + LAMBDA("lambda"), + SNS("sns"), + SQS("sqs"), + REDSHIFT("redshift"), + SES("ses"), + ROUTE53("route53"), + CLOUDFORMATION("cloudformation"), + CLOUDWATCH("cloudwatch"), + SSM("ssm"), + SECRETSMANAGER("secretsmanager"), + STEPFUNCTIONS("stepfunctions"), + CLOUDWATCHLOGS("logs"), + STS("sts"), + IAM("iam"), + KMS("kms"); -import org.testcontainers.containers.localstack.LocalStackContainer.Service; + private final String serviceName; -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -public @interface Aws2Client { + Service(String serviceName) { + this.serviceName = serviceName; + } - /** - * - * @return the {@link Service} for which we want a client - */ - Service value(); + public String getName() { + return serviceName; + } } diff --git a/integration-tests-support/azure/pom.xml b/integration-tests-support/azure/pom.xml index 3d9240f9df..ace1e1b58f 100644 --- a/integration-tests-support/azure/pom.xml +++ b/integration-tests-support/azure/pom.xml @@ -42,19 +42,11 @@ <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> <exclusion> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - </dependency> </dependencies> </project> diff --git a/integration-tests-support/debezium/pom.xml b/integration-tests-support/debezium/pom.xml index a807135867..b37765e235 100644 --- a/integration-tests-support/debezium/pom.xml +++ b/integration-tests-support/debezium/pom.xml @@ -60,17 +60,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>localstack</artifactId> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-localstack</artifactId> </dependency> <dependency> <groupId>io.rest-assured</groupId> diff --git a/integration-tests-support/google/pom.xml b/integration-tests-support/google/pom.xml index 5e454327d7..5da826a1f0 100644 --- a/integration-tests-support/google/pom.xml +++ b/integration-tests-support/google/pom.xml @@ -46,29 +46,15 @@ <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> <exclusion> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>gcloud</artifactId> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> + <artifactId>testcontainers-gcloud</artifactId> </dependency> </dependencies> </project> diff --git a/integration-tests-support/kafka/pom.xml b/integration-tests-support/kafka/pom.xml index 1c07e448d0..5ede9ea543 100644 --- a/integration-tests-support/kafka/pom.xml +++ b/integration-tests-support/kafka/pom.xml @@ -41,16 +41,6 @@ <dependency> <groupId>io.strimzi</groupId> <artifactId>strimzi-test-container</artifactId> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> </dependency> </dependencies> diff --git a/integration-tests-support/mongodb/pom.xml b/integration-tests-support/mongodb/pom.xml index 242df6ab95..da4035fb7e 100644 --- a/integration-tests-support/mongodb/pom.xml +++ b/integration-tests-support/mongodb/pom.xml @@ -41,16 +41,6 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> </dependency> </dependencies> </project> diff --git a/integration-tests-support/splunk/pom.xml b/integration-tests-support/splunk/pom.xml index 90d334f54c..6dbe3825c4 100644 --- a/integration-tests-support/splunk/pom.xml +++ b/integration-tests-support/splunk/pom.xml @@ -37,16 +37,6 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> </dependency> </dependencies> diff --git a/integration-tests/cassandraql/pom.xml b/integration-tests/cassandraql/pom.xml index b414c59fc3..aa203583fb 100644 --- a/integration-tests/cassandraql/pom.xml +++ b/integration-tests/cassandraql/pom.xml @@ -65,13 +65,9 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>cassandra</artifactId> + <artifactId>testcontainers-cassandra</artifactId> <scope>test</scope> <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> @@ -86,11 +82,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> - <scope>test</scope> - </dependency> </dependencies> <profiles> diff --git a/integration-tests/debezium-grouped/pom.xml b/integration-tests/debezium-grouped/pom.xml index 1d5ad3d77e..34f4b14977 100644 --- a/integration-tests/debezium-grouped/pom.xml +++ b/integration-tests/debezium-grouped/pom.xml @@ -98,62 +98,27 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>postgresql</artifactId> + <artifactId>testcontainers-postgresql</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>mysql</artifactId> + <artifactId>testcontainers-mysql</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>mssqlserver</artifactId> + <artifactId>testcontainers-mssqlserver</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>mongodb</artifactId> + <artifactId>testcontainers-mongodb</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>oracle-xe</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-oracle-xe</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests/langchain4j-embeddingstore/pom.xml b/integration-tests/langchain4j-embeddingstore/pom.xml index ae1b6127a1..0f5041b2fb 100644 --- a/integration-tests/langchain4j-embeddingstore/pom.xml +++ b/integration-tests/langchain4j-embeddingstore/pom.xml @@ -95,18 +95,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>qdrant</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-qdrant</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests/pinecone/pom.xml b/integration-tests/pinecone/pom.xml index 1a956c2608..fef17699dd 100644 --- a/integration-tests/pinecone/pom.xml +++ b/integration-tests/pinecone/pom.xml @@ -59,18 +59,7 @@ <!-- test dependencies --> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>pinecone</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-pinecone</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests/qdrant/pom.xml b/integration-tests/qdrant/pom.xml index 4c70fdd5af..407851bd49 100644 --- a/integration-tests/qdrant/pom.xml +++ b/integration-tests/qdrant/pom.xml @@ -57,18 +57,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>qdrant</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-qdrant</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/integration-tests/solr/pom.xml b/integration-tests/solr/pom.xml index 40ec8eb4b7..1c45d8e1fe 100644 --- a/integration-tests/solr/pom.xml +++ b/integration-tests/solr/pom.xml @@ -61,18 +61,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>solr</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-solr</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests/spring-rabbitmq/pom.xml b/integration-tests/spring-rabbitmq/pom.xml index 6a1167efa8..e8adcb20fc 100644 --- a/integration-tests/spring-rabbitmq/pom.xml +++ b/integration-tests/spring-rabbitmq/pom.xml @@ -62,18 +62,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>rabbitmq</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-rabbitmq</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/integration-tests/weaviate/pom.xml b/integration-tests/weaviate/pom.xml index 13db697f76..8d16fee334 100644 --- a/integration-tests/weaviate/pom.xml +++ b/integration-tests/weaviate/pom.xml @@ -61,18 +61,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>weaviate</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit4-mock</artifactId> + <artifactId>testcontainers-weaviate</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 3cf0d16457..023925fd92 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ <quarkiverse-minio.version>3.8.6</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>2.4.2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.8.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> - <quarkus.version>3.30.1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>4.1.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.10.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -133,8 +133,8 @@ <jedis-client.version>${jedis-client-version}</jedis-client.version> <json-smart.version>${json-smart-version}</json-smart.version> <jxmpp.version>1.1.0</jxmpp.version><!-- @sync org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid --> - <kafka.version>4.0.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> - <keycloak.version>26.4.5</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version --> + <kafka.version>4.1.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> + <keycloak.version>26.4.7</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version --> <kudu.version>${kudu-version}</kudu.version> <kotlin.version>2.2.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> <kotlinx.version>1.4.0</kotlinx.version><!--Used by com.squareup.wire:wire-compiler referenced from aws2:kinesis --> @@ -177,7 +177,7 @@ <web3j.version>${web3j-version}</web3j.version> <web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version> <zookeeper.version>${zookeeper-version}</zookeeper.version> - <zstd-jni.version>1.5.6-6</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni --> + <zstd-jni.version>1.5.6-10</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni --> <!-- Test dependency versions (keep sorted alphabetically) --> <consul-client.version>${consul-client-version}</consul-client.version> @@ -204,7 +204,7 @@ <formatter-maven-plugin.version>2.29.0</formatter-maven-plugin.version> <gmavenplus-maven-plugin.version>3.0.0</gmavenplus-maven-plugin.version> <impsort-maven-plugin.version>1.12.0</impsort-maven-plugin.version> - <jandex-maven-plugin.version>3.5.2</jandex-maven-plugin.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:jandex.version --> + <jandex-maven-plugin.version>3.5.3</jandex-maven-plugin.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:jandex.version --> <keytool-maven-plugin.version>1.7</keytool-maven-plugin.version> <license-maven-plugin.version>5.0.0</license-maven-plugin.version> <maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e939907354..74b52e93c9 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7017,7 +7017,7 @@ <dependency> <groupId>com.github.luben</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>zstd-jni</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.5.6-6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.5.6-10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.github.mwiede</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7679,12 +7679,12 @@ <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>connect-json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.1.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.1.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 4ec63fd041..f4f8cb7dc9 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7007,7 +7007,7 @@ <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> - <version>1.5.6-6</version> + <version>1.5.6-10</version> </dependency> <dependency> <groupId>com.github.mwiede</groupId> @@ -7624,12 +7624,12 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-json</artifactId> - <version>4.0.1</version> + <version>4.1.1</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-runtime</artifactId> - <version>4.0.1</version> + <version>4.1.1</version> <exclusions> <exclusion> <groupId>io.swagger.core.v3</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index f91c61a7da..f08f088617 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7007,7 +7007,7 @@ <dependency> <groupId>com.github.luben</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>zstd-jni</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.5.6-6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.5.6-10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.github.mwiede</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7624,12 +7624,12 @@ <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>connect-json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.1.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.1.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
