You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/11/20 07:15:03 UTC
(camel-quarkus) branch main updated: Remove tests and documentation for Quarkus Amazon Services integration
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new b84a2a6f59 Remove tests and documentation for Quarkus Amazon Services integration
b84a2a6f59 is described below
commit b84a2a6f59c6121e5bd8c2c92a8e15f476ff052f
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Nov 19 10:07:01 2024 +0000
Remove tests and documentation for Quarkus Amazon Services integration
---
.../modules/ROOT/pages/migration-guide/3.17.0.adoc | 11 +
docs/modules/ROOT/pages/migration-guide/index.adoc | 1 +
.../ROOT/pages/reference/extensions/aws2-ddb.adoc | 34 --
.../ROOT/pages/reference/extensions/aws2-s3.adoc | 34 --
.../ROOT/pages/reference/extensions/aws2-ses.adoc | 34 --
.../ROOT/pages/reference/extensions/aws2-sns.adoc | 34 --
.../ROOT/pages/reference/extensions/aws2-sqs.adoc | 34 --
extensions/aws2-ddb/runtime/pom.xml | 2 -
extensions/aws2-s3/runtime/pom.xml | 2 -
extensions/aws2-ses/runtime/pom.xml | 2 -
extensions/aws2-sns/runtime/pom.xml | 2 -
extensions/aws2-sqs/runtime/pom.xml | 2 -
.../aws2-quarkus-client/README.adoc | 48 ---
.../aws2-quarkus-client/aws2-ddb/pom.xml | 207 -----------
.../aws2/ddb/it/Aws2DdbQuarkusClientResource.java | 60 ---
.../src/main/resources/application.properties | 19 -
.../aws2/ddb/it/Aws2DdbQuarkusClientIT.java | 24 --
.../aws2/ddb/it/Aws2DdbQuarkusClientTest.java | 38 --
.../it/Aws2DdbQuarkusClientTestEnvCustomizer.java | 138 -------
...quarkus.test.support.aws2.Aws2TestEnvCustomizer | 1 -
.../aws2-quarkus-client/aws2-s3/pom.xml | 224 ------------
.../aws2/s3/it/Aws2S3QuarkusClientInvoker.java | 29 --
.../src/main/resources/application.properties | 22 --
.../it/Aws2S3QuarkusClientTestEnvCustomizer.java | 62 ----
...quarkus.test.support.aws2.Aws2TestEnvCustomizer | 1 -
.../aws2-quarkus-client/aws2-ses/pom.xml | 212 -----------
.../aws2/ses/it/Aws2SesQuarkusClientInvoker.java | 28 --
.../src/main/resources/application.properties | 21 --
.../it/Aws2SesQuarkusClientTestEnvCustomizer.java | 63 ----
...quarkus.test.support.aws2.Aws2TestEnvCustomizer | 1 -
.../aws2-quarkus-client/aws2-sqs-sns/pom.xml | 228 ------------
.../aws2/sns/it/Aws2SnsQuarkusClientInvoker.java | 32 --
.../src/main/resources/application.properties | 20 -
.../it/Aws2SnsQuarkusClientTestEnvCustomizer.java | 73 ----
...quarkus.test.support.aws2.Aws2TestEnvCustomizer | 1 -
.../aws2-quarkus-client/aws2-sqs/pom.xml | 212 -----------
.../aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java | 29 --
.../src/main/resources/application.properties | 19 -
.../it/Aws2SqsQuarkusClientTestEnvCustomizer.java | 63 ----
...quarkus.test.support.aws2.Aws2TestEnvCustomizer | 1 -
.../aws2-quarkus-client/pom.xml | 48 ---
integration-test-groups/pom.xml | 1 -
.../aws2-quarkus-client-grouped/.gitignore | 3 -
.../aws2-quarkus-client-grouped/README.adoc | 8 -
.../aws2-quarkus-client-grouped/pom.xml | 402 ---------------------
integration-tests/pom.xml | 1 -
pom.xml | 10 -
.../camel/quarkus/maven/CamelQuarkusExtension.java | 21 +-
.../quarkus/maven/UpdateExtensionDocPageMojo.java | 10 -
.../doc-templates/extension-doc-page.adoc | 35 +-
tooling/scripts/test-categories.yaml | 1 -
51 files changed, 15 insertions(+), 2593 deletions(-)
diff --git a/docs/modules/ROOT/pages/migration-guide/3.17.0.adoc b/docs/modules/ROOT/pages/migration-guide/3.17.0.adoc
new file mode 100644
index 0000000000..87676713cd
--- /dev/null
+++ b/docs/modules/ROOT/pages/migration-guide/3.17.0.adoc
@@ -0,0 +1,11 @@
+= Camel Quarkus 3.17.0 Migration Guide
+
+The following guide outlines how to adapt your code to changes that were made in Camel Quarkus 3.17.0.
+
+== Reduced support when using Quarkus Amazon Services extensions with Camel Quarkus AWS2 extensions
+
+Historically, the Camel Quarkus project tested & verified that using https://docs.quarkiverse.io/quarkus-amazon-services/1.x/index.html[Quarkus Amazon Services] extensions in conjunction with Camel Quarkus AWS2 extensions worked successfully.
+
+From Camel Quarkus 3.17.0, this verification step ceases to exist and the Camel Quarkus AWS2 extension documentation no longer makes reference to Quarkus Amazon Services.
+
+If you want to leverage AWS support on Camel Quarkus, the recommended approach is to use the https://quarkus.io/extensions/?search-regex=camel-quarkus-aws2[camel-quarkus-aws2] extensions without Quarkus Amazon Services.
diff --git a/docs/modules/ROOT/pages/migration-guide/index.adoc b/docs/modules/ROOT/pages/migration-guide/index.adoc
index 7e28b46dae..e8a74ccdd4 100644
--- a/docs/modules/ROOT/pages/migration-guide/index.adoc
+++ b/docs/modules/ROOT/pages/migration-guide/index.adoc
@@ -4,6 +4,7 @@ We do frequent releases, a release almost every month, and even though we strive
Listed here are guides on how to migrate between major versions and anything of significance to watch for when upgrading from minor versions.
+* xref:migration-guide/3.17.0.adoc[Camel Quarkus 3.16.x to Camel Quarkus 3.17.0 migration guide]
* xref:migration-guide/3.15.0.adoc[Camel Quarkus 3.14.x to Camel Quarkus 3.15.0 migration guide]
* xref:migration-guide/3.2.0.adoc[Camel Quarkus 2.x to Camel Quarkus 3.2.0 migration guide]
* xref:migration-guide/2.11.0.adoc[Camel Quarkus 2.10.0 to Camel Quarkus 2.11.0 migration guide]
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc
index baa3e8dc16..4f0fea2393 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-ddb.adoc
@@ -52,37 +52,3 @@ endif::[]
This extension auto-enables SSL support in native mode. Hence you do not need to add
`quarkus.ssl.native=true` to your `application.properties` yourself. See also
https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
-
-[id="extensions-aws2-ddb-additional-camel-quarkus-configuration"]
-== Additional Camel Quarkus configuration
-
-[id="extensions-aws2-ddb-optional-integration-with-quarkus-amazon-dynamodb"]
-=== Optional integration with Quarkus Amazon DynamoDB
-
-If desired, it is possible to use the Quarkus Amazon DynamoDB extension in conjunction with Camel Quarkus AWS 2 DynamoDB.
-Note that this is fully optional and not mandatory at all.
-Please follow the https://quarkus.io/guides/amazon-dynamodb#configuring-dynamodb-clients[Quarkus documentation] but beware of the following caveats:
-
-1. The client type `apache` has to be selected by configuring the following property:
-+
-[source,properties]
-----
-quarkus.dynamodb.sync-client.type=apache
-----
-
-2. The `DynamoDbClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime.
-You can reach that e.g. by adding a dummy bean injecting `DynamoDbClient`:
-+
-[source,java]
-----
-import jakarta.enterprise.context.ApplicationScoped;
-import io.quarkus.arc.Unremovable;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@ApplicationScoped
-@Unremovable
-class UnremovableDynamoDbClient {
- @Inject
- DynamoDbClient dynamoDbClient;
-}
-----
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc
index b6cbd94690..5ce4d06275 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-s3.adoc
@@ -51,37 +51,3 @@ endif::[]
This extension auto-enables SSL support in native mode. Hence you do not need to add
`quarkus.ssl.native=true` to your `application.properties` yourself. See also
https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
-
-[id="extensions-aws2-s3-additional-camel-quarkus-configuration"]
-== Additional Camel Quarkus configuration
-
-[id="extensions-aws2-s3-optional-integration-with-quarkus-amazon-s3"]
-=== Optional integration with Quarkus Amazon S3
-
-If desired, it is possible to use the Quarkus Amazon S3 extension in conjunction with Camel Quarkus AWS 2 S3 Storage Service.
-Note that this is fully optional and not mandatory at all.
-Please follow the https://quarkus.io/guides/amazon-s3#configuring-s3-clients[Quarkus documentation] but beware of the following caveats:
-
-1. The client type `apache` has to be selected by configuring the following property:
-+
-[source,properties]
-----
-quarkus.s3.sync-client.type=apache
-----
-
-2. The `S3Client` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime.
-You can reach that e.g. by adding a dummy bean injecting `S3Client`:
-+
-[source,java]
-----
-import jakarta.enterprise.context.ApplicationScoped;
-import io.quarkus.arc.Unremovable;
-import software.amazon.awssdk.services.s3.S3Client;
-
-@ApplicationScoped
-@Unremovable
-class UnremovableS3Client {
- @Inject
- S3Client s3Client;
-}
-----
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc
index 8496acf747..3a630b4767 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-ses.adoc
@@ -51,37 +51,3 @@ endif::[]
This extension auto-enables SSL support in native mode. Hence you do not need to add
`quarkus.ssl.native=true` to your `application.properties` yourself. See also
https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
-
-[id="extensions-aws2-ses-additional-camel-quarkus-configuration"]
-== Additional Camel Quarkus configuration
-
-[id="extensions-aws2-ses-optional-integration-with-quarkus-amazon-ses"]
-=== Optional integration with Quarkus Amazon SES
-
-If desired, it is possible to use the Quarkus Amazon SES extension in conjunction with Camel Quarkus AWS 2 Simple Email Service (SES).
-Note that this is fully optional and not mandatory at all.
-Please follow the https://quarkus.io/guides/amazon-ses#configuring-ses-clients[Quarkus documentation] but beware of the following caveats:
-
-1. The client type `apache` has to be selected by configuring the following property:
-+
-[source,properties]
-----
-quarkus.ses.sync-client.type=apache
-----
-
-2. The `SesClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime.
-You can reach that e.g. by adding a dummy bean injecting `SesClient`:
-+
-[source,java]
-----
-import jakarta.enterprise.context.ApplicationScoped;
-import io.quarkus.arc.Unremovable;
-import software.amazon.awssdk.services.ses.SesClient;
-
-@ApplicationScoped
-@Unremovable
-class UnremovableSesClient {
- @Inject
- SesClient sesClient;
-}
-----
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc
index 412ce8d51b..2d3982e809 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-sns.adoc
@@ -51,37 +51,3 @@ endif::[]
This extension auto-enables SSL support in native mode. Hence you do not need to add
`quarkus.ssl.native=true` to your `application.properties` yourself. See also
https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
-
-[id="extensions-aws2-sns-additional-camel-quarkus-configuration"]
-== Additional Camel Quarkus configuration
-
-[id="extensions-aws2-sns-optional-integration-with-quarkus-amazon-sns"]
-=== Optional integration with Quarkus Amazon SNS
-
-If desired, it is possible to use the Quarkus Amazon SNS extension in conjunction with Camel Quarkus AWS 2 Simple Notification System (SNS).
-Note that this is fully optional and not mandatory at all.
-Please follow the https://quarkus.io/guides/amazon-sns#configuring-sns-clients[Quarkus documentation] but beware of the following caveats:
-
-1. The client type `apache` has to be selected by configuring the following property:
-+
-[source,properties]
-----
-quarkus.sns.sync-client.type=apache
-----
-
-2. The `SnsClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime.
-You can reach that e.g. by adding a dummy bean injecting `SnsClient`:
-+
-[source,java]
-----
-import jakarta.enterprise.context.ApplicationScoped;
-import io.quarkus.arc.Unremovable;
-import software.amazon.awssdk.services.sns.SnsClient;
-
-@ApplicationScoped
-@Unremovable
-class UnremovableSnsClient {
- @Inject
- SnsClient snsClient;
-}
-----
diff --git a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
index c9efb6c376..b101511ecc 100644
--- a/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/aws2-sqs.adoc
@@ -51,37 +51,3 @@ endif::[]
This extension auto-enables SSL support in native mode. Hence you do not need to add
`quarkus.ssl.native=true` to your `application.properties` yourself. See also
https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide].
-
-[id="extensions-aws2-sqs-additional-camel-quarkus-configuration"]
-== Additional Camel Quarkus configuration
-
-[id="extensions-aws2-sqs-optional-integration-with-quarkus-amazon-sqs"]
-=== Optional integration with Quarkus Amazon SQS
-
-If desired, it is possible to use the Quarkus Amazon SQS extension in conjunction with Camel Quarkus AWS 2 Simple Queue Service (SQS).
-Note that this is fully optional and not mandatory at all.
-Please follow the https://quarkus.io/guides/amazon-sqs#configuring-sqs-clients[Quarkus documentation] but beware of the following caveats:
-
-1. The client type `apache` has to be selected by configuring the following property:
-+
-[source,properties]
-----
-quarkus.sqs.sync-client.type=apache
-----
-
-2. The `SqsClient` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime.
-You can reach that e.g. by adding a dummy bean injecting `SqsClient`:
-+
-[source,java]
-----
-import jakarta.enterprise.context.ApplicationScoped;
-import io.quarkus.arc.Unremovable;
-import software.amazon.awssdk.services.sqs.SqsClient;
-
-@ApplicationScoped
-@Unremovable
-class UnremovableSqsClient {
- @Inject
- SqsClient sqsClient;
-}
-----
diff --git a/extensions/aws2-ddb/runtime/pom.xml b/extensions/aws2-ddb/runtime/pom.xml
index a75efa15bb..ff23962f0e 100644
--- a/extensions/aws2-ddb/runtime/pom.xml
+++ b/extensions/aws2-ddb/runtime/pom.xml
@@ -34,8 +34,6 @@
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
<camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince>
<quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords>
- <cq.quarkus.aws.client.baseName>DynamoDB</cq.quarkus.aws.client.baseName>
- <cq.quarkus.aws.client.fqClassName>software.amazon.awssdk.services.dynamodb.DynamoDbClient</cq.quarkus.aws.client.fqClassName>
</properties>
<dependencies>
diff --git a/extensions/aws2-s3/runtime/pom.xml b/extensions/aws2-s3/runtime/pom.xml
index f08ab118bb..49fe0e7d2d 100644
--- a/extensions/aws2-s3/runtime/pom.xml
+++ b/extensions/aws2-s3/runtime/pom.xml
@@ -33,8 +33,6 @@
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
<camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince>
<quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords>
- <cq.quarkus.aws.client.baseName>S3</cq.quarkus.aws.client.baseName>
- <cq.quarkus.aws.client.fqClassName>software.amazon.awssdk.services.s3.S3Client</cq.quarkus.aws.client.fqClassName>
</properties>
<dependencies>
diff --git a/extensions/aws2-ses/runtime/pom.xml b/extensions/aws2-ses/runtime/pom.xml
index eb52478b70..3640683571 100644
--- a/extensions/aws2-ses/runtime/pom.xml
+++ b/extensions/aws2-ses/runtime/pom.xml
@@ -33,8 +33,6 @@
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
<camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince>
<quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords>
- <cq.quarkus.aws.client.baseName>SES</cq.quarkus.aws.client.baseName>
- <cq.quarkus.aws.client.fqClassName>software.amazon.awssdk.services.ses.SesClient</cq.quarkus.aws.client.fqClassName>
</properties>
<dependencies>
diff --git a/extensions/aws2-sns/runtime/pom.xml b/extensions/aws2-sns/runtime/pom.xml
index 857d19c3e8..ab174c5e8c 100644
--- a/extensions/aws2-sns/runtime/pom.xml
+++ b/extensions/aws2-sns/runtime/pom.xml
@@ -33,8 +33,6 @@
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
<camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince>
<quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords>
- <cq.quarkus.aws.client.baseName>SNS</cq.quarkus.aws.client.baseName>
- <cq.quarkus.aws.client.fqClassName>software.amazon.awssdk.services.sns.SnsClient</cq.quarkus.aws.client.fqClassName>
</properties>
<dependencies>
diff --git a/extensions/aws2-sqs/runtime/pom.xml b/extensions/aws2-sqs/runtime/pom.xml
index 5c739fba44..733e1c12f4 100644
--- a/extensions/aws2-sqs/runtime/pom.xml
+++ b/extensions/aws2-sqs/runtime/pom.xml
@@ -33,8 +33,6 @@
<camel.quarkus.jvmSince>1.0.0</camel.quarkus.jvmSince>
<camel.quarkus.nativeSince>1.0.0</camel.quarkus.nativeSince>
<quarkus.metadata.keywords>Amazon</quarkus.metadata.keywords>
- <cq.quarkus.aws.client.baseName>SQS</cq.quarkus.aws.client.baseName>
- <cq.quarkus.aws.client.fqClassName>software.amazon.awssdk.services.sqs.SqsClient</cq.quarkus.aws.client.fqClassName>
</properties>
<dependencies>
diff --git a/integration-test-groups/aws2-quarkus-client/README.adoc b/integration-test-groups/aws2-quarkus-client/README.adoc
deleted file mode 100644
index 7fe0701208..0000000000
--- a/integration-test-groups/aws2-quarkus-client/README.adoc
+++ /dev/null
@@ -1,48 +0,0 @@
-= Camel Quarkus AWS 2 with Quarkus AWS 2 client extensions isolated integration tests
-
-=== Localstack
-
-The tests able to run against Localstack are run against Localstack by default.
-
-The SES test is ignored unless `MAILSLURP_API_KEY` variable is set.
-
-=== Real AWS API
-
-To run the tests against the real AWS API, you need to
-
-* Export Your
- https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys[AWS credentials]
- (access key ID and secret access key)
-* Export our preferred
- https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions[AWS region].
-* For SES, you additionally need a https://app.mailslurp.com/[MailSlurp account] and API key
- (the free dev account should be enough)
-
-[source,shell]
-----
-export AWS_ACCESS_KEY=<your-access-key-id>
-export AWS_SECRET_KEY=<your-secret-access-key>
-export AWS_REGION=eu-central-1
-# for SES
-export MAILSLURP_API_KEY=<your-mailslurp-api-key>
-----
-
-or
-
-* Set default credentials and Region for your environment (https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/setup.html#setup-credentials[documentation])
-* Export our preferred
-https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions[AWS region].
-* Export a flag forcing clients to use default credentials.
-* For SES, you additionally need a https://app.mailslurp.com/[MailSlurp account] and API key
-(the free dev account should be enough)
-
-[source,shell]
-----
-export AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=true
-export AWS_REGION=eu-central-1
-# for SES
-export MAILSLURP_API_KEY=<your-mailslurp-api-key>
-----
-
-You may want to `export CAMEL_QUARKUS_START_MOCK_BACKEND=false` to force testing against
-the real AWS API.
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
deleted file mode 100644
index 0dc95320f8..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/pom.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-aws2-ddb-quarkus-client</artifactId>
- <name>Camel Quarkus :: Integration Tests :: AWS 2 DynamoDB Quarkus Client</name>
- <description>Integration tests for Camel Quarkus AWS 2 DynamoDB extension with the Quarkus AWS DynamoDB client</description>
-
- <properties>
- <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ddb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-dynamodb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties, **/*Stream*</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ddb-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>skip-testcontainers-tests</id>
- <activation>
- <property>
- <name>skip-testcontainers-tests</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientResource.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientResource.java
deleted file mode 100644
index 2f1e645695..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientResource.java
+++ /dev/null
@@ -1,60 +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.
- */
-package org.apache.camel.quarkus.component.aws2.ddb.it;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.aws2.ddb.Ddb2Endpoint;
-import org.apache.camel.component.aws2.ddb.Ddb2Operations;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
-
-@Path("/aws2-ddb-quarkus-client")
-@ApplicationScoped
-public class Aws2DdbQuarkusClientResource {
-
- @Inject
- CamelContext context;
-
- @Inject
- DynamoDbClient dynamoDB;
-
- @ConfigProperty(name = "aws-ddb.table-name")
- String tableName;
-
- @Path("/verify/client")
- @GET
- @Produces(MediaType.TEXT_PLAIN)
- public boolean quarkusManagesDynamoDbClient() {
- Ddb2Endpoint endpoint = context.getEndpoint(componentUri(Ddb2Operations.GetItem), Ddb2Endpoint.class);
- DynamoDbClient camelDynamoDbClient = endpoint.getConfiguration().getAmazonDDBClient();
- return camelDynamoDbClient != null && camelDynamoDbClient.equals(dynamoDB);
- }
-
- private String componentUri(Ddb2Operations op) {
- return componentUri(Aws2DdbResource.Table.basic, op);
- }
-
- private String componentUri(Aws2DdbResource.Table table, Ddb2Operations op) {
- return "aws2-ddb://" + this.tableName + "?operation=" + op;
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/resources/application.properties
deleted file mode 100644
index b90cd2e6b5..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/main/resources/application.properties
+++ /dev/null
@@ -1,19 +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.
-## ---------------------------------------------------------------------------
-
-quarkus.dynamodb.sync-client.type=apache
-quarkus.devservices.enabled=false
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientIT.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientIT.java
deleted file mode 100644
index aed731dd0e..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientIT.java
+++ /dev/null
@@ -1,24 +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.
- */
-package org.apache.camel.quarkus.component.aws2.ddb.it;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-class Aws2DdbQuarkusClientIT extends Aws2DdbQuarkusClientTest {
-
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java
deleted file mode 100644
index 4f15d502ac..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTest.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.camel.quarkus.component.aws2.ddb.it;
-
-import io.quarkus.test.common.QuarkusTestResource;
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.RestAssured;
-import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
-import org.junit.jupiter.api.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-
-@QuarkusTest
-@QuarkusTestResource(Aws2TestResource.class)
-class Aws2DdbQuarkusClientTest {
-
- @Test
- public void quarkusManagesDynamoDbClient() {
- RestAssured.get("/aws2-ddb-quarkus-client/verify/client")
- .then()
- .statusCode(200)
- .body(is("true"));
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTestEnvCustomizer.java
deleted file mode 100644
index 77602b68aa..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbQuarkusClientTestEnvCustomizer.java
+++ /dev/null
@@ -1,138 +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.
- */
-package org.apache.camel.quarkus.component.aws2.ddb.it;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-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.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;
-import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
-import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
-import software.amazon.awssdk.services.dynamodb.model.KeyType;
-import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
-import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
-import software.amazon.awssdk.services.dynamodb.model.StreamSpecification;
-import software.amazon.awssdk.services.dynamodb.model.StreamViewType;
-import software.amazon.awssdk.services.dynamodb.waiters.DynamoDbWaiter;
-
-public class Aws2DdbQuarkusClientTestEnvCustomizer implements Aws2TestEnvCustomizer {
-
- @Override
- public Service[] localstackServices() {
- return new Service[] { Service.DYNAMODB, Service.DYNAMODB_STREAMS };
- }
-
- @Override
- public void customize(Aws2TestEnvContext envContext) {
-
- //remove camel properties for client creation to ensure that client is not created by camel component
- envContext.removeClient(localstackServices());
-
- final String tableName = "camel-quarkus-" + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
- envContext.property("aws-ddb.table-name", tableName);
-
- final String tableNameOperations = "camel-quarkus-operations-"
- + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
- envContext.property("aws-ddb.operations-table-name", tableNameOperations);
-
- final String tableNameStreams = "camel-quarkus-streams-"
- + RandomStringUtils.randomAlphanumeric(16).toLowerCase(Locale.ROOT);
- envContext.property("aws-ddb.stream-table-name", tableNameStreams);
-
- List<String> tableNames = Stream.of(tableName, tableNameStreams, tableNameOperations).collect(Collectors.toList());
-
- final DynamoDbClient client = envContext.client(Service.DYNAMODB, DynamoDbClient::builder);
- {
- final String keyColumn = "key";
-
- for (String table : tableNames) {
- client.createTable(
- createTableRequest(table, keyColumn)
- .build());
- }
-
- for (String table : tableNames) {
- try (DynamoDbWaiter dbWaiter = client.waiter()) {
- dbWaiter.waitUntilTableExists(DescribeTableRequest.builder()
- .tableName(table)
- .build());
- }
-
- envContext.closeable(() -> client.deleteTable(DeleteTableRequest.builder().tableName(table).build()));
- }
- }
-
- Map<String, String> envContextProperties = envContext.getProperties();
-
- if (envContext.isUseDefaultCredentialsProvider()) {
- envContext.property("quarkus.dynamodb.aws.credentials.type", "default");
- } else {
- envContext.property("quarkus.dynamodb.aws.credentials.static-provider.access-key-id", envContext.getAccessKey());
- envContext.property("quarkus.dynamodb.aws.credentials.static-provider.secret-access-key",
- envContext.getSecretKey());
- envContext.property("quarkus.dynamodb.aws.credentials.type", "static");
- }
- envContext.property("quarkus.dynamodb.aws.region", envContext.getRegion());
-
- // Propagate localstack environment config to Quarkus AWS if required
- Optional<String> overrideEndpoint = envContextProperties
- .keySet()
- .stream()
- .filter(key -> key.endsWith("uri-endpoint-override"))
- .findFirst();
-
- if (overrideEndpoint.isPresent()) {
- String endpoint = envContextProperties.get(overrideEndpoint.get());
- envContext.property("quarkus.dynamodb.endpoint-override", endpoint);
- }
- }
-
- private CreateTableRequest.Builder createTableRequest(String tableName, String keyColumn) {
- CreateTableRequest.Builder builder = CreateTableRequest.builder()
- .attributeDefinitions(AttributeDefinition.builder()
- .attributeName(keyColumn)
- .attributeType(ScalarAttributeType.S)
- .build())
- .keySchema(KeySchemaElement.builder()
- .attributeName(keyColumn)
- .keyType(KeyType.HASH)
- .build())
- .provisionedThroughput(ProvisionedThroughput.builder()
- .readCapacityUnits(10L)
- .writeCapacityUnits(10L)
- .build());
- if (tableName.contains("streams")) {
- builder.streamSpecification(StreamSpecification.builder()
- .streamEnabled(true)
- .streamViewType(StreamViewType.NEW_AND_OLD_IMAGES)
- .build());
- }
-
- return builder.tableName(tableName);
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
deleted file mode 100644
index 9c0371db12..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ddb/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.camel.quarkus.component.aws2.ddb.it.Aws2DdbQuarkusClientTestEnvCustomizer
\ No newline at end of file
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
deleted file mode 100644
index 87732d331a..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/pom.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-aws2-s3-quarkus-client</artifactId>
- <name>Camel Quarkus :: Integration Tests :: AWS 2 S3 Quarkus Client</name>
- <description>Integration tests for Camel Quarkus AWS 2 S3 extension with the Quarkus AWS S3 client</description>
-
- <properties>
- <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-kms</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-kms-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-s3-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>skip-testcontainers-tests</id>
- <activation>
- <property>
- <name>skip-testcontainers-tests</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientInvoker.java
deleted file mode 100644
index 7234f13437..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientInvoker.java
+++ /dev/null
@@ -1,29 +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.
- */
-package org.apache.camel.quarkus.component.aws2.s3.it;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import software.amazon.awssdk.services.s3.S3Client;
-
-@ApplicationScoped
-public class Aws2S3QuarkusClientInvoker {
-
- @Inject
- S3Client s3;
-
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/resources/application.properties
deleted file mode 100644
index 4b987f7981..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/main/resources/application.properties
+++ /dev/null
@@ -1,22 +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.
-## ---------------------------------------------------------------------------
-#
-# Quarkus :: S3 Client options
-#
-quarkus.s3.sync-client.type=apache
-quarkus.s3.checksum-validation=false
-quarkus.devservices.enabled=false
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientTestEnvCustomizer.java
deleted file mode 100644
index a554ee7d6c..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/java/org/apache/camel/quarkus/component/aws2/s3/it/Aws2S3QuarkusClientTestEnvCustomizer.java
+++ /dev/null
@@ -1,62 +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.
- */
-package org.apache.camel.quarkus.component.aws2.s3.it;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
-
-public class Aws2S3QuarkusClientTestEnvCustomizer extends Aws2S3TestEnvCustomizer {
-
- @Override
- public Service[] localstackServices() {
- return super.localstackServices();
- }
-
- @Override
- public void customize(Aws2TestEnvContext envContext) {
- super.customize(envContext);
-
- //remove camel properties for client creation to ensure that client is not created by camel component
- envContext.removeClient(localstackServices());
-
- Map<String, String> envContextProperties = envContext.getProperties();
-
- if (envContext.isUseDefaultCredentialsProvider()) {
- envContext.property("quarkus.s3.aws.credentials.type", "default");
- } else {
- envContext.property("quarkus.s3.aws.credentials.static-provider.access-key-id", envContext.getAccessKey());
- envContext.property("quarkus.s3.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey());
- envContext.property("quarkus.s3.aws.credentials.type", "static");
- }
- envContext.property("quarkus.s3.aws.region", envContext.getRegion());
-
- // Propagate localstack environment config to Quarkus AWS if required
- Optional<String> overrideEndpoint = envContextProperties
- .keySet()
- .stream()
- .filter(key -> key.endsWith("uri-endpoint-override"))
- .findFirst();
-
- if (overrideEndpoint.isPresent()) {
- String endpoint = envContextProperties.get(overrideEndpoint.get());
- envContext.property("quarkus.s3.endpoint-override", endpoint);
- }
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
deleted file mode 100644
index 055bf8425f..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-s3/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.camel.quarkus.component.aws2.s3.it.Aws2S3QuarkusClientTestEnvCustomizer
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
deleted file mode 100644
index 7617bdb539..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/pom.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-aws2-ses-quarkus-client</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Simple Email Service (SES) Quarkus Client</name>
- <description>Integration tests for Camel Quarkus AWS Simple Email Service (SES) extension with the Quarkus AWS SES client</description>
-
- <properties>
- <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ses</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-ses</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>htmlunit-driver</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ses-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>skip-testcontainers-tests</id>
- <activation>
- <property>
- <name>skip-testcontainers-tests</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientInvoker.java
deleted file mode 100644
index 40be5a8f1b..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientInvoker.java
+++ /dev/null
@@ -1,28 +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.
- */
-package org.apache.camel.quarkus.component.aws2.ses.it;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import software.amazon.awssdk.services.ses.SesClient;
-
-@ApplicationScoped
-public class Aws2SesQuarkusClientInvoker {
-
- @Inject
- SesClient ses;
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/resources/application.properties
deleted file mode 100644
index 7059001521..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/main/resources/application.properties
+++ /dev/null
@@ -1,21 +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.
-## ---------------------------------------------------------------------------
-
-mailslurp.api.key=${MAILSLURP_API_KEY}
-
-quarkus.ses.sync-client.type=apache
-quarkus.devservices.enabled=false
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientTestEnvCustomizer.java
deleted file mode 100644
index 581ec5d15e..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/java/org/apache/camel/quarkus/component/aws2/ses/it/Aws2SesQuarkusClientTestEnvCustomizer.java
+++ /dev/null
@@ -1,63 +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.
- */
-package org.apache.camel.quarkus.component.aws2.ses.it;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
-
-public class Aws2SesQuarkusClientTestEnvCustomizer extends Aws2SesTestEnvCustomizer {
-
- @Override
- public Service[] localstackServices() {
- return super.localstackServices();
- }
-
- @Override
- public void customize(Aws2TestEnvContext envContext) {
-
- super.customize(envContext);
-
- //remove camel properties for client creation to ensure that client is not created by camel component
- envContext.removeClient(localstackServices());
-
- Map<String, String> envContextProperties = envContext.getProperties();
-
- if (envContext.isUseDefaultCredentialsProvider()) {
- envContext.property("quarkus.ses.aws.credentials.type", "default");
- } else {
- envContext.property("quarkus.ses.aws.credentials.static-provider.access-key-id", envContext.getAccessKey());
- envContext.property("quarkus.ses.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey());
- envContext.property("quarkus.ses.aws.credentials.type", "static");
- }
- envContext.property("quarkus.ses.aws.region", envContext.getRegion());
-
- // Propagate localstack environment config to Quarkus AWS if required
- Optional<String> overrideEndpoint = envContextProperties
- .keySet()
- .stream()
- .filter(key -> key.endsWith("uri-endpoint-override"))
- .findFirst();
-
- if (overrideEndpoint.isPresent()) {
- String endpoint = envContextProperties.get(overrideEndpoint.get());
- envContext.property("quarkus.ses.endpoint-override", endpoint);
- }
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
deleted file mode 100644
index 5483ca8df3..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-ses/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.camel.quarkus.component.aws2.ses.it.Aws2SesQuarkusClientTestEnvCustomizer
\ No newline at end of file
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
deleted file mode 100644
index 13cbaaa550..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/pom.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-aws2-sqs-sns-quarkus-client</artifactId>
- <name>Camel Quarkus :: Integration Tests :: AWS 2 SQS and SNS Quarkus Client</name>
- <description>Integration tests for SQS and SNS extensions with the Quarkus AWS clients</description>
-
- <properties>
- <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sqs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sns</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-sqs</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-sns</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>htmlunit-driver</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sqs-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sns-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>skip-testcontainers-tests</id>
- <activation>
- <property>
- <name>skip-testcontainers-tests</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientInvoker.java
deleted file mode 100644
index 3052de0232..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientInvoker.java
+++ /dev/null
@@ -1,32 +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.
- */
-package org.apache.camel.quarkus.component.aws2.sns.it;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import software.amazon.awssdk.services.sns.SnsClient;
-import software.amazon.awssdk.services.sqs.SqsClient;
-
-@ApplicationScoped
-public class Aws2SnsQuarkusClientInvoker {
-
- @Inject
- SqsClient sqs;
-
- @Inject
- SnsClient sns;
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/resources/application.properties
deleted file mode 100644
index 6e65c73e2b..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/main/resources/application.properties
+++ /dev/null
@@ -1,20 +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.
-## ---------------------------------------------------------------------------
-
-quarkus.sns.sync-client.type=apache
-quarkus.sqs.sync-client.type=apache
-quarkus.devservices.enabled=false
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientTestEnvCustomizer.java
deleted file mode 100644
index 50c39fe904..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sns/it/Aws2SnsQuarkusClientTestEnvCustomizer.java
+++ /dev/null
@@ -1,73 +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.
- */
-package org.apache.camel.quarkus.component.aws2.sns.it;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
-
-public class Aws2SnsQuarkusClientTestEnvCustomizer extends Aws2SqsSnsTestEnvCustomizer {
-
- @Override
- public Service[] localstackServices() {
- return super.localstackServices();
- }
-
- @Override
- public void customize(Aws2TestEnvContext envContext) {
-
- super.customize(envContext);
-
- //remove camel properties for client creation to ensure that client is not created by camel component
- envContext.removeClient(localstackServices());
-
- Map<String, String> envContextProperties = envContext.getProperties();
-
- if (envContext.isUseDefaultCredentialsProvider()) {
- envContext.property("quarkus.sns.aws.credentials.type", "default");
- } else {
- envContext.property("quarkus.sns.aws.credentials.static-provider.access-key-id", envContext.getAccessKey());
- envContext.property("quarkus.sns.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey());
- envContext.property("quarkus.sns.aws.credentials.type", "static");
- }
- envContext.property("quarkus.sns.aws.region", envContext.getRegion());
-
- if (envContext.isUseDefaultCredentialsProvider()) {
- envContext.property("quarkus.sqs.aws.credentials.type", "default");
- } else {
- envContext.property("quarkus.sqs.aws.credentials.static-provider.access-key-id", envContext.getAccessKey());
- envContext.property("quarkus.sqs.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey());
- envContext.property("quarkus.sqs.aws.credentials.type", "static");
- }
- envContext.property("quarkus.sqs.aws.region", envContext.getRegion());
-
- // Propagate localstack environment config to Quarkus AWS if required
- Optional<String> overrideEndpoint = envContextProperties
- .keySet()
- .stream()
- .filter(key -> key.endsWith("uri-endpoint-override"))
- .findFirst();
-
- if (overrideEndpoint.isPresent()) {
- String endpoint = envContextProperties.get(overrideEndpoint.get());
- envContext.property("quarkus.sns.endpoint-override", endpoint);
- envContext.property("quarkus.sqs.endpoint-override", endpoint);
- }
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
deleted file mode 100644
index c663c03de2..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs-sns/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.camel.quarkus.component.aws2.sns.it.Aws2SnsQuarkusClientTestEnvCustomizer
\ No newline at end of file
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml b/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
deleted file mode 100644
index 4b80802df0..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/pom.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- <relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-aws2-sqs-quarkus-client</artifactId>
- <name>Camel Quarkus :: Integration Tests :: AWS 2 SQS Quarkus Client</name>
- <description>Integration tests for SQS extensions with the Quarkus AWS clients</description>
-
- <properties>
- <test.class.name.prefix>QuarkusClient</test.class.name.prefix>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sqs</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-sqs</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
- </dependency>
-
- <!-- test dependencies -->
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>htmlunit-driver</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sqs-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>skip-testcontainers-tests</id>
- <activation>
- <property>
- <name>skip-testcontainers-tests</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java
deleted file mode 100644
index 35eec12964..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientInvoker.java
+++ /dev/null
@@ -1,29 +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.
- */
-package org.apache.camel.quarkus.component.aws2.sqs.it;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import software.amazon.awssdk.services.sqs.SqsClient;
-
-@ApplicationScoped
-public class Aws2SqsQuarkusClientInvoker {
-
- @Inject
- SqsClient sqs;
-
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/resources/application.properties b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/resources/application.properties
deleted file mode 100644
index 08a0ad9dbd..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/main/resources/application.properties
+++ /dev/null
@@ -1,19 +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.
-## ---------------------------------------------------------------------------
-
-quarkus.sqs.sync-client.type=apache
-quarkus.devservices.enabled=false
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java
deleted file mode 100644
index 7f09e41f60..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsQuarkusClientTestEnvCustomizer.java
+++ /dev/null
@@ -1,63 +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.
- */
-package org.apache.camel.quarkus.component.aws2.sqs.it;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
-
-public class Aws2SqsQuarkusClientTestEnvCustomizer extends Aws2SqsTestEnvCustomizer {
-
- @Override
- public Service[] localstackServices() {
- return super.localstackServices();
- }
-
- @Override
- public void customize(Aws2TestEnvContext envContext) {
-
- super.customize(envContext);
-
- //remove camel properties for client creation to ensure that client is not created by camel component
- envContext.removeClient(localstackServices());
-
- Map<String, String> envContextProperties = envContext.getProperties();
-
- if (envContext.isUseDefaultCredentialsProvider()) {
- envContext.property("quarkus.sqs.aws.credentials.type", "default");
- } else {
- envContext.property("quarkus.sqs.aws.credentials.static-provider.access-key-id", envContext.getAccessKey());
- envContext.property("quarkus.sqs.aws.credentials.static-provider.secret-access-key", envContext.getSecretKey());
- envContext.property("quarkus.sqs.aws.credentials.type", "static");
- }
- envContext.property("quarkus.sqs.aws.region", envContext.getRegion());
-
- // Propagate localstack environment config to Quarkus AWS if required
- Optional<String> overrideEndpoint = envContextProperties
- .keySet()
- .stream()
- .filter(key -> key.endsWith("uri-endpoint-override"))
- .findFirst();
-
- if (overrideEndpoint.isPresent()) {
- String endpoint = envContextProperties.get(overrideEndpoint.get());
- envContext.property("quarkus.sqs.endpoint-override", endpoint);
- }
- }
-}
diff --git a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer b/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
deleted file mode 100644
index ffc9a76cb1..0000000000
--- a/integration-test-groups/aws2-quarkus-client/aws2-sqs/src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.camel.quarkus.component.aws2.sqs.it.Aws2SqsQuarkusClientTestEnvCustomizer
\ No newline at end of file
diff --git a/integration-test-groups/aws2-quarkus-client/pom.xml b/integration-test-groups/aws2-quarkus-client/pom.xml
deleted file mode 100644
index 5cfc7a84fe..0000000000
--- a/integration-test-groups/aws2-quarkus-client/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-test-groups</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-quarkus-integration-tests-aws2-quarkus-client</artifactId>
- <packaging>pom</packaging>
-
- <name>Camel Quarkus :: AWS 2 Quarkus Client Integration Tests</name>
- <description>Camel Quarkus AWS 2 Integration Tests Using Quarkus AWS extensions</description>
-
- <properties>
- <quarkus.banner.enabled>false</quarkus.banner.enabled>
- </properties>
-
- <modules>
- <!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
- <module>aws2-ddb</module>
- <module>aws2-s3</module>
- <module>aws2-ses</module>
- <module>aws2-sqs</module>
- <module>aws2-sqs-sns</module>
- </modules>
-
-</project>
diff --git a/integration-test-groups/pom.xml b/integration-test-groups/pom.xml
index 24fa81d866..17623791b9 100644
--- a/integration-test-groups/pom.xml
+++ b/integration-test-groups/pom.xml
@@ -39,7 +39,6 @@
<modules>
<!-- test groups a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
<module>aws2</module>
- <module>aws2-quarkus-client</module>
<module>azure</module>
<module>compression</module>
<module>cxf-soap</module>
diff --git a/integration-tests/aws2-quarkus-client-grouped/.gitignore b/integration-tests/aws2-quarkus-client-grouped/.gitignore
deleted file mode 100644
index 6119608b19..0000000000
--- a/integration-tests/aws2-quarkus-client-grouped/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# src/main and src/test are copied from the underlying isolated modules by group-tests.groovy
-/src/
diff --git a/integration-tests/aws2-quarkus-client-grouped/README.adoc b/integration-tests/aws2-quarkus-client-grouped/README.adoc
deleted file mode 100644
index 4332a51214..0000000000
--- a/integration-tests/aws2-quarkus-client-grouped/README.adoc
+++ /dev/null
@@ -1,8 +0,0 @@
-== Camel Quarkus AWS 2 With Quarkus AW2 Client extensions grouped integration tests
-
-This module allows executing all tests from `integration-test-groups/aws2-quarkus-client/*` grouped together.
-See the https://camel.apache.org/camel-quarkus/latest/contributor-guide/extension-testing.html#_grouping[Grouping section] of the Contributor guide for more details.
-
-=== Mock backend vs. real service
-
-Please refer to link:../../integration-test-groups/aws2-quarkus-client/README.adoc[integration-test-groups/aws2-quarkus-client/README.adoc] for more details.
diff --git a/integration-tests/aws2-quarkus-client-grouped/pom.xml b/integration-tests/aws2-quarkus-client-grouped/pom.xml
deleted file mode 100644
index 30a5a9f774..0000000000
--- a/integration-tests/aws2-quarkus-client-grouped/pom.xml
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-build-parent-it</artifactId>
- <version>3.17.0-SNAPSHOT</version>
- <relativePath>../../poms/build-parent-it/pom.xml</relativePath>
- </parent>
-
- <artifactId>camel-quarkus-integration-test-aws2-quarkus-client-grouped</artifactId>
- <name>Camel Quarkus :: Integration Tests :: AWS2 Quarkus Client Grouped</name>
- <description>AWS 2 tests from ../integration-test-groups/aws2-quarkus-client merged together</description>
-
- <properties>
- <test.class.name.prefix>GroupedQuarkusClient</test.class.name.prefix>
- </properties>
-
- <!-- Regenerate the dependencies via `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependencies>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-dynamodb</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-ses</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-sns</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkiverse.amazonservices</groupId>
- <artifactId>quarkus-amazon-sqs</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-resteasy-jackson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ddb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-kms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-s3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ses</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sns</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sqs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- </dependency>
- <dependency>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-junit5</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.rest-assured</groupId>
- <artifactId>rest-assured</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>htmlunit-driver</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support-aws2</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/main/java</source>
- </sources>
- </configuration>
- </execution>
- <execution>
- <id>add-test-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/src/test/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <executions>
- <execution>
- <id>group-sources</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/group-tests.groovy</script>
- </scripts>
- <properties>
- <group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2-quarkus-client</group-tests.source.dir>
- <group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
- <group-tests.concat.rel.paths>src/main/resources/application.properties,src/test/resources/META-INF/services/org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer</group-tests.concat.rel.paths>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- <execution>
- <id>copy-client-test-sources-ses</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ses</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- <execution>
- <id>copy-client-test-sources-ddb</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-ddb</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties,**/*Stream*</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- <execution>
- <id>copy-client-test-sources-s3</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-s3</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- <execution>
- <id>copy-client-test-sources-sqs</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- <execution>
- <id>copy-client-test-sources-sqs-sns</id>
- <goals>
- <goal>execute</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <scripts>
- <script>file:${maven.multiModuleProjectDirectory}/tooling/scripts/copy-tests.groovy</script>
- </scripts>
- <properties>
- <copy-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/aws2/aws2-sqs-sns</copy-tests.source.dir>
- <copy-tests.dest.module.dir>${project.basedir}</copy-tests.dest.module.dir>
- <copy-tests.excludes>**/*TestEnvCustomizer,**/*application.properties</copy-tests.excludes>
- <group-tests.class.name.prefix>${test.class.name.prefix}</group-tests.class.name.prefix>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>native</id>
- <activation>
- <property>
- <name>native</name>
- </property>
- </activation>
- <properties>
- <quarkus.native.enabled>true</quarkus.native.enabled>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>virtualDependencies</id>
- <activation>
- <property>
- <name>!noVirtualDependencies</name>
- </property>
- </activation>
- <dependencies>
- <!-- The following dependencies guarantee that this module is built after them. You can update them by running `mvn process-resources -Pformat -N` from the source tree root directory -->
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ddb-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-kms-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-s3-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-ses-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sns-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-aws2-sqs-deployment</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>skip-testcontainers-tests</id>
- <activation>
- <property>
- <name>skip-testcontainers-tests</name>
- </property>
- </activation>
- <properties>
- <skipTests>true</skipTests>
- </properties>
- </profile>
- </profiles>
-
-</project>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 65cdeee604..44adecb9b9 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -60,7 +60,6 @@
<!--<module>avro-rpc</module>-->
<module>aws2</module>
<module>aws2-grouped</module>
- <module>aws2-quarkus-client-grouped</module>
<module>azure-grouped</module>
<module>base64</module>
<module>bean-validator</module>
diff --git a/pom.xml b/pom.xml
index 62d2fdcb86..d47005860f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -940,7 +940,6 @@
<sortModulesPath>integration-tests-jvm/pom.xml</sortModulesPath>
<sortModulesPath>integration-test-groups/pom.xml</sortModulesPath>
<sortModulesPath>integration-test-groups/aws2/pom.xml</sortModulesPath>
- <sortModulesPath>integration-test-groups/aws2-quarkus-client/pom.xml</sortModulesPath>
<sortModulesPath>integration-test-groups/azure/pom.xml</sortModulesPath>
<sortModulesPath>integration-test-groups/compression/pom.xml</sortModulesPath>
<sortModulesPath>integration-test-groups/foundation/pom.xml</sortModulesPath>
@@ -985,15 +984,6 @@
</sourcePoms>
<destinationPom>${basedir}/integration-tests/aws2-grouped/pom.xml</destinationPom>
</mergePom>
- <mergePom>
- <sourcePoms>
- <directory>${basedir}/integration-test-groups/aws2-quarkus-client</directory>
- <includes>
- <include>*/pom.xml</include>
- </includes>
- </sourcePoms>
- <destinationPom>${basedir}/integration-tests/aws2-quarkus-client-grouped/pom.xml</destinationPom>
- </mergePom>
<mergePom>
<sourcePoms>
<directory>${basedir}/integration-test-groups/azure</directory>
diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
index 923d3f8d6f..ce797b5c3c 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CamelQuarkusExtension.java
@@ -95,9 +95,7 @@ public class CamelQuarkusExtension {
unlisted,
deprecated,
deps == null ? Collections.emptyList() : Collections.unmodifiableList(deps),
- kind,
- props.getProperty("cq.quarkus.aws.client.baseName"),
- props.getProperty("cq.quarkus.aws.client.fqClassName"));
+ kind);
} catch (IOException | XmlPullParserException e) {
throw new RuntimeException("Could not read " + runtimePomXmlPath, e);
}
@@ -118,8 +116,6 @@ public class CamelQuarkusExtension {
private final boolean unlisted;
private final boolean deprecated;
private final Kind kind;
- private final String quarkusAwsClientBaseName;
- private final String quarkusAwsClientFqClassName;
public CamelQuarkusExtension(
Path runtimePomXmlPath,
@@ -136,9 +132,7 @@ public class CamelQuarkusExtension {
boolean unlisted,
boolean deprecated,
List<Dependency> dependencies,
- Kind kind,
- String quarkusAwsClientBaseName,
- String quarkusAwsClientFqClassName) {
+ Kind kind) {
super();
this.runtimePomXmlPath = runtimePomXmlPath;
this.camelComponentArtifactId = camelComponentArtifactId;
@@ -155,8 +149,6 @@ public class CamelQuarkusExtension {
this.deprecated = deprecated;
this.dependencies = dependencies;
this.kind = kind;
- this.quarkusAwsClientBaseName = quarkusAwsClientBaseName;
- this.quarkusAwsClientFqClassName = quarkusAwsClientFqClassName;
}
public String getVersion() {
@@ -222,13 +214,4 @@ public class CamelQuarkusExtension {
public Kind getKind() {
return kind;
}
-
- public Optional<String> getQuarkusAwsClientBaseName() {
- return Optional.ofNullable(quarkusAwsClientBaseName);
- }
-
- public Optional<String> getQuarkusAwsClientFqClassName() {
- return Optional.ofNullable(quarkusAwsClientFqClassName);
- }
-
}
diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
index f29f2e3e87..d408448011 100644
--- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
+++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java
@@ -132,8 +132,6 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
final Path multiModuleProjectDirectoryPath = multiModuleProjectDirectory.toPath();
final CamelQuarkusExtension ext = CamelQuarkusExtension.read(runtimeModuleDir.resolve("pom.xml"));
- final Path quarkusAwsClientTestsDir = multiModuleProjectDirectoryPath
- .resolve("integration-test-groups/aws2-quarkus-client");
final Path pomRelPath = multiModuleProjectDirectoryPath.relativize(runtimeModuleDir).resolve("pom.xml");
if (ext.getJvmSince().isEmpty()) {
@@ -191,14 +189,6 @@ public class UpdateExtensionDocPageMojo extends AbstractDocGeneratorMojo {
model.put("activatesTransferException",
ext.isNativeSupported()
&& detectComponentOrEndpointOption(catalog, ext.getRuntimeArtifactIdBase(), "transferException"));
- model.put(
- "quarkusAwsClient",
- getQuarkusAwsClient(
- quarkusAwsClientTestsDir,
- ext.getRuntimeArtifactIdBase(),
- ext.getQuarkusAwsClientBaseName(),
- ext.getQuarkusAwsClientFqClassName(),
- ext.getRuntimePomXmlPath()));
model.put("activatesQuarkusLangChain4jBom", ext.getRuntimeArtifactId().contains("langchain4j"));
final List<ConfigItem> configOptions = listConfigOptions(
runtimeModuleDir,
diff --git a/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc b/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc
index d36cee6d3f..7709f67071 100644
--- a/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc
+++ b/tooling/maven-plugin/src/main/resources/doc-templates/extension-doc-page.adoc
@@ -123,7 +123,7 @@ In order to ensure alignment across all Quarkus and LangChain4j related dependen
Note that the import order is paramount when using maven `dependencyManagement`.
As such, one might need to import the `quarkus-langchain4j-bom` before other related Camel and Quarkus boms.
[/#if]
-[#if configuration?? || quarkusAwsClient?? || configOptions?size != 0 ]
+[#if configuration?? || configOptions?size != 0 ]
[id="extensions-[=artifactIdBase]-additional-camel-quarkus-configuration"]
== Additional Camel Quarkus configuration
@@ -131,39 +131,6 @@ As such, one might need to import the `quarkus-langchain4j-bom` before other rel
[=configuration]
[/#if]
-[#if quarkusAwsClient??]
-
-[id="extensions-[=artifactIdBase]-optional-integration-with-[=quarkusAwsClient.extensionNameIdHeading]"]
-=== Optional integration with [=quarkusAwsClient.extensionName]
-
-If desired, it is possible to use the [=quarkusAwsClient.extensionName] extension in conjunction with Camel Quarkus [=name].
-Note that this is fully optional and not mandatory at all.
-Please follow the [=quarkusAwsClient.configurationUrl][Quarkus documentation] but beware of the following caveats:
-
-1. The client type `apache` has to be selected by configuring the following property:
-+
-[source,properties]
-----
-[=quarkusAwsClient.configBase].sync-client.type=apache
-----
-
-2. The `[=quarkusAwsClient.clientClassSimpleName]` has to be made "unremovable" in the sense of https://quarkus.io/guides/cdi-reference#remove_unused_beans[Quarkus CDI reference] so that Camel Quarkus is able to look it up at runtime.
-You can reach that e.g. by adding a dummy bean injecting `[=quarkusAwsClient.clientClassSimpleName]`:
-+
-[source,java]
-----
-import jakarta.enterprise.context.ApplicationScoped;
-import io.quarkus.arc.Unremovable;
-import [=quarkusAwsClient.clientClassFqName];
-
-@ApplicationScoped
-@Unremovable
-class Unremovable[=quarkusAwsClient.clientClassSimpleName] {
- @Inject
- [=quarkusAwsClient.clientClassSimpleName] [=quarkusAwsClient.clientFieldName];
-}
-----
-[/#if]
[#if configOptions?size != 0 ]
[width="100%",cols="80,5,15",options="header"]
diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml
index 4f9b4fd620..c95b679ad1 100644
--- a/tooling/scripts/test-categories.yaml
+++ b/tooling/scripts/test-categories.yaml
@@ -169,7 +169,6 @@ group-09:
- xpath
group-10:
- as2
- - aws2-quarkus-client-grouped
- braintree
- consul
- digitalocean