This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch testcontainers-2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 6a27d26b0e54c2bb294af102906a3b4edcef24fb Author: James Netherton <[email protected]> AuthorDate: Mon Dec 8 13:06:45 2025 +0000 WIP - Testcontainers 2.x --- amqp/pom.xml | 2 +- artemis-elasticsearch/pom.xml | 4 ++-- aws-lambda/pom.xml | 2 +- aws2-s3/pom.xml | 14 ++------------ .../src/test/java/org/acme/aws2/s3/Aws2S3TestResource.java | 9 ++++----- cluster-leader-election/pom.xml | 2 +- cxf-soap/pom.xml | 2 +- data-extract-langchain4j/pom.xml | 4 ++-- fhir/pom.xml | 2 +- file-bindy-ftp/pom.xml | 2 +- file-split-log-xml/pom.xml | 2 +- health/pom.xml | 2 +- http-log/pom.xml | 2 +- jdbc-datasource/pom.xml | 2 +- jms-jpa/pom.xml | 2 +- jpa-idempotent-repository/pom.xml | 2 +- jta-jpa/pom.xml | 2 +- kafka/pom.xml | 2 +- kamelet-chucknorris/pom.xml | 2 +- message-bridge/pom.xml | 2 +- netty-custom-correlation/pom.xml | 2 +- observability/pom.xml | 2 +- openapi-contract-first/pom.xml | 2 +- platform-http-security-keycloak/pom.xml | 2 +- rest-json/pom.xml | 2 +- saga/pom.xml | 2 +- spring-redis/pom.xml | 2 +- timer-log-main/pom.xml | 2 +- timer-log/pom.xml | 2 +- vertx-websocket-chat/pom.xml | 2 +- 30 files changed, 36 insertions(+), 47 deletions(-) diff --git a/amqp/pom.xml b/amqp/pom.xml index b43f2164..a3012fae 100644 --- a/amqp/pom.xml +++ b/amqp/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: AMQP</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/artemis-elasticsearch/pom.xml b/artemis-elasticsearch/pom.xml index 731e95e6..f2f71773 100644 --- a/artemis-elasticsearch/pom.xml +++ b/artemis-elasticsearch/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Artemis ElasticSearch</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> @@ -115,7 +115,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>elasticsearch</artifactId> + <artifactId>testcontainers-elasticsearch</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml index e92e24ba..3c1145b2 100644 --- a/aws-lambda/pom.xml +++ b/aws-lambda/pom.xml @@ -27,7 +27,7 @@ <description>Camel Quarkus Example :: Deploying a Camel Route in AWS Lambda</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/aws2-s3/pom.xml b/aws2-s3/pom.xml index b7b4ed45..39b00c74 100644 --- a/aws2-s3/pom.xml +++ b/aws2-s3/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Upload a file to an AWS S3 bucket</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> @@ -100,17 +100,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> </dependencies> diff --git a/aws2-s3/src/test/java/org/acme/aws2/s3/Aws2S3TestResource.java b/aws2-s3/src/test/java/org/acme/aws2/s3/Aws2S3TestResource.java index 38f7db80..20d93bd4 100644 --- a/aws2-s3/src/test/java/org/acme/aws2/s3/Aws2S3TestResource.java +++ b/aws2-s3/src/test/java/org/acme/aws2/s3/Aws2S3TestResource.java @@ -27,8 +27,8 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.containers.localstack.LocalStackContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.localstack.LocalStackContainer; import org.testcontainers.utility.DockerImageName; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; @@ -65,7 +65,7 @@ public class Aws2S3TestResource implements QuarkusTestResourceLifecycleManager { .parse(config.getValue("localstack.container.image", String.class)) .asCompatibleSubstituteFor("localstack/localstack"); localstack = new LocalStackContainer(imageName) - .withServices(LocalStackContainer.Service.S3) + .withServices("s3") .withEnv("LS_LOG", "info") .withEnv("AWS_ACCESS_KEY_ID", "testAccessKeyId") .withEnv("AWS_SECRET_ACCESS_KEY", "testSecretKeyId") @@ -76,8 +76,7 @@ public class Aws2S3TestResource implements QuarkusTestResourceLifecycleManager { "camel.component.aws2-s3.secretKey", localstack.getSecretKey(), "camel.component.aws2-s3.region", localstack.getRegion(), "camel.component.aws2-s3.override-endpoint", "true", - "camel.component.aws2-s3.uri-endpoint-override", - localstack.getEndpointOverride(LocalStackContainer.Service.S3).toString(), + "camel.component.aws2-s3.uri-endpoint-override", localstack.getEndpoint().toString(), "cq.aws2-s3.example.bucketName", createBucket()); } @@ -86,7 +85,7 @@ public class Aws2S3TestResource implements QuarkusTestResourceLifecycleManager { clientBuilder .credentialsProvider(StaticCredentialsProvider .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey()))) - .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3)) + .endpointOverride(localstack.getEndpoint()) .region(Region.of(localstack.getRegion())); final S3Client s3Client = clientBuilder.build(); diff --git a/cluster-leader-election/pom.xml b/cluster-leader-election/pom.xml index c981d7f1..3d3768a2 100644 --- a/cluster-leader-election/pom.xml +++ b/cluster-leader-election/pom.xml @@ -29,7 +29,7 @@ <description>Camel Quarkus Example :: Cluster leader election</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/cxf-soap/pom.xml b/cxf-soap/pom.xml index 1e7e2680..3459584c 100644 --- a/cxf-soap/pom.xml +++ b/cxf-soap/pom.xml @@ -29,7 +29,7 @@ <description>Camel Quarkus Example :: CXF SOAP</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/data-extract-langchain4j/pom.xml b/data-extract-langchain4j/pom.xml index 9f9bc150..68e462d1 100644 --- a/data-extract-langchain4j/pom.xml +++ b/data-extract-langchain4j/pom.xml @@ -31,7 +31,7 @@ <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> @@ -127,7 +127,7 @@ </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>ollama</artifactId> + <artifactId>testcontainers-ollama</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/fhir/pom.xml b/fhir/pom.xml index a1b9fc6a..83cfe9b5 100644 --- a/fhir/pom.xml +++ b/fhir/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: FHIR</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml index dcf801e4..d9c71b08 100644 --- a/file-bindy-ftp/pom.xml +++ b/file-bindy-ftp/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: File Bindy FTP</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/file-split-log-xml/pom.xml b/file-split-log-xml/pom.xml index 8680c0a2..a3807af7 100644 --- a/file-split-log-xml/pom.xml +++ b/file-split-log-xml/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: File To Log XML DSL</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/health/pom.xml b/health/pom.xml index e0806a1f..40d60fd8 100644 --- a/health/pom.xml +++ b/health/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Health Check</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/http-log/pom.xml b/http-log/pom.xml index 6b08fc67..e3829690 100644 --- a/http-log/pom.xml +++ b/http-log/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: HTTP to Log</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/jdbc-datasource/pom.xml b/jdbc-datasource/pom.xml index 291e3b0f..4c850d22 100644 --- a/jdbc-datasource/pom.xml +++ b/jdbc-datasource/pom.xml @@ -25,7 +25,7 @@ <name>Camel Quarkus :: Examples :: Jdbc - DatataSource - Log</name> <description>Camel Quarkus Example :: Connect to Database using Datasource</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/jms-jpa/pom.xml b/jms-jpa/pom.xml index aab66095..f5651e23 100644 --- a/jms-jpa/pom.xml +++ b/jms-jpa/pom.xml @@ -25,7 +25,7 @@ <name>Camel Quarkus :: Examples :: JMS JPA</name> <description>Camel Quarkus Example :: JMS JPA</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkiverse-artemis.version>3.11.1</quarkiverse-artemis.version> diff --git a/jpa-idempotent-repository/pom.xml b/jpa-idempotent-repository/pom.xml index 4ff27d62..f4319bdf 100644 --- a/jpa-idempotent-repository/pom.xml +++ b/jpa-idempotent-repository/pom.xml @@ -30,7 +30,7 @@ <description>Camel Quarkus Example :: JPA Idempotent Repository</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/jta-jpa/pom.xml b/jta-jpa/pom.xml index d601a1d9..d431441e 100644 --- a/jta-jpa/pom.xml +++ b/jta-jpa/pom.xml @@ -25,7 +25,7 @@ <name>Camel Quarkus :: Examples :: JTA JPA</name> <description>Camel Quarkus Example :: JTA JPA</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/kafka/pom.xml b/kafka/pom.xml index d3889ce4..d76745a2 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Kafka</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml index eabc12c7..8003b0fc 100644 --- a/kamelet-chucknorris/pom.xml +++ b/kamelet-chucknorris/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Kamelet Chuck Norris</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/message-bridge/pom.xml b/message-bridge/pom.xml index 472dd3a0..d6689615 100644 --- a/message-bridge/pom.xml +++ b/message-bridge/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Configure XA Transactions and connection pooling</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/netty-custom-correlation/pom.xml b/netty-custom-correlation/pom.xml index c36315c3..5969712d 100644 --- a/netty-custom-correlation/pom.xml +++ b/netty-custom-correlation/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Communication with Netty over TCP</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/observability/pom.xml b/observability/pom.xml index 925bc848..34fde925 100644 --- a/observability/pom.xml +++ b/observability/pom.xml @@ -29,7 +29,7 @@ <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/openapi-contract-first/pom.xml b/openapi-contract-first/pom.xml index c1c97054..5c31849b 100644 --- a/openapi-contract-first/pom.xml +++ b/openapi-contract-first/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: openapi-contract-first</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/platform-http-security-keycloak/pom.xml b/platform-http-security-keycloak/pom.xml index 6bc5161d..30904a1d 100644 --- a/platform-http-security-keycloak/pom.xml +++ b/platform-http-security-keycloak/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Platform HTTP Security Keycloak</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/rest-json/pom.xml b/rest-json/pom.xml index 7fd811a6..007eca4c 100644 --- a/rest-json/pom.xml +++ b/rest-json/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Rest Json</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/saga/pom.xml b/saga/pom.xml index 796afea7..be9e420e 100644 --- a/saga/pom.xml +++ b/saga/pom.xml @@ -29,7 +29,7 @@ <packaging>pom</packaging> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkiverse-artemis.version>3.11.1</quarkiverse-artemis.version> diff --git a/spring-redis/pom.xml b/spring-redis/pom.xml index 2f727eb7..c2f8513e 100644 --- a/spring-redis/pom.xml +++ b/spring-redis/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Send and receive messages from Redis</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/timer-log-main/pom.xml b/timer-log-main/pom.xml index 63130bf3..e669ee29 100644 --- a/timer-log-main/pom.xml +++ b/timer-log-main/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Timer to Log Main</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/timer-log/pom.xml b/timer-log/pom.xml index b4ed2155..6bf6eb3e 100644 --- a/timer-log/pom.xml +++ b/timer-log/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Timer to Log</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> diff --git a/vertx-websocket-chat/pom.xml b/vertx-websocket-chat/pom.xml index 69f9e316..3a6c027f 100644 --- a/vertx-websocket-chat/pom.xml +++ b/vertx-websocket-chat/pom.xml @@ -28,7 +28,7 @@ <description>Camel Quarkus Example :: Implementing Websocket</description> <properties> - <quarkus.platform.version>3.30.1</quarkus.platform.version> + <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version> <camel-quarkus.platform.version>3.31.0-SNAPSHOT</camel-quarkus.platform.version> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
