This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit deda3ff64010b1fdeb2c62f2f1e2e60e275b57a2 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Mon Nov 9 08:36:27 2020 +0100 Use localstack 0.12.1 everywhere --- .../java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java | 9 --------- .../org/apache/camel/test/infra/aws2/services/AWSContainer.java | 2 +- .../test/infra/aws2/services/AWSSQSLocalContainerService.java | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java index b42956d..8ceef1b 100644 --- a/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java +++ b/components/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; -import java.net.URI; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -41,15 +40,8 @@ import org.apache.camel.util.FileUtil; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.http.SdkHttpClient; -import software.amazon.awssdk.http.SdkHttpConfigurationOption; -import software.amazon.awssdk.http.apache.ApacheHttpClient; -import software.amazon.awssdk.http.apache.ProxyConfiguration; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.sqs.SqsClient; -import software.amazon.awssdk.services.sqs.SqsClientBuilder; import software.amazon.awssdk.services.sqs.model.CreateQueueRequest; import software.amazon.awssdk.services.sqs.model.CreateQueueResponse; import software.amazon.awssdk.services.sqs.model.GetQueueUrlRequest; @@ -58,7 +50,6 @@ import software.amazon.awssdk.services.sqs.model.ListQueuesResponse; import software.amazon.awssdk.services.sqs.model.MessageAttributeValue; import software.amazon.awssdk.services.sqs.model.QueueAttributeName; import software.amazon.awssdk.services.sqs.model.SetQueueAttributesRequest; -import software.amazon.awssdk.utils.AttributeMap; /** * Sending and receive messages to/from AWS SQS service using AWS SDK version 2.x. diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java index 45988b3..6c2f50e 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java +++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSContainer.java @@ -35,7 +35,7 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; behave as in runtime. */ public class AWSContainer extends GenericContainer<AWSContainer> { - private static final String LOCALSTACK_CONTAINER = "localstack/localstack:0.11.3"; + private static final String LOCALSTACK_CONTAINER = "localstack/localstack:0.12.1"; private static final Logger LOG = LoggerFactory.getLogger(AWSLocalContainerService.class); private static final int SERVICE_PORT = 4566; diff --git a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java index b5e9499..72a4c10 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java +++ b/test-infra/camel-test-infra-aws-v2/src/test/java/org/apache/camel/test/infra/aws2/services/AWSSQSLocalContainerService.java @@ -29,7 +29,7 @@ public class AWSSQSLocalContainerService extends AWSLocalContainerService<SqsCli public AWSSQSLocalContainerService() { // Current latest container - localstack/localstack:0.11.3 - is broken for SQS // therefore uses an older version - super("localstack/localstack:0.11.2", Service.SQS); + super("localstack/localstack:0.12.1", Service.SQS); } @Override