From d0c4b167d4a1b61dc165f1c660cd799c23467f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Tue, 13 Aug 2024 14:48:32 +0200 Subject: [PATCH] chore: dependencies upgrade --- build.gradle | 11 +++++------ .../java/io/kestra/plugin/aws/sqs/AbstractSqs.java | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 8a1e8f0..44c1006 100644 --- a/build.gradle +++ b/build.gradle @@ -58,10 +58,9 @@ dependencies { // AWS libs: versions are managed by the Micronaut BOM api platform("io.micronaut.platform:micronaut-platform") api 'software.amazon.awssdk:cloudwatchlogs' - api 'software.amazon.awssdk:batch:2.26.16' // we can remove this after micronaut bump as long as it contains the RegisterJobDefinitionRequest.ecsProperties exists api 'software.amazon.awssdk:s3' api 'software.amazon.awssdk:s3-transfer-manager' - api 'software.amazon.awssdk.crt:aws-crt:0.29.19' //used by s3-transfer-manager + api 'software.amazon.awssdk.crt:aws-crt:0.30.6' //used by s3-transfer-manager api 'software.amazon.awssdk:apache-client' api 'software.amazon.awssdk:dynamodb' api 'software.amazon.awssdk:sns' @@ -122,11 +121,11 @@ dependencies { testImplementation group: "io.kestra", name: "repository-memory" // testcontainers - testImplementation "org.testcontainers:testcontainers:1.20.0" - testImplementation "org.testcontainers:junit-jupiter:1.20.0" - testImplementation "org.testcontainers:localstack:1.20.0" + testImplementation "org.testcontainers:testcontainers:1.20.1" + testImplementation "org.testcontainers:junit-jupiter:1.20.1" + testImplementation "org.testcontainers:localstack:1.20.1" // Localstack module misses SDK v1 classes that are mandatory, see https://github.com/testcontainers/testcontainers-java/issues/1442#issuecomment-694342883 - testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.730' + testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.767' } /**********************************************************************************************************************\ diff --git a/src/main/java/io/kestra/plugin/aws/sqs/AbstractSqs.java b/src/main/java/io/kestra/plugin/aws/sqs/AbstractSqs.java index 7d4e9cb..8200585 100644 --- a/src/main/java/io/kestra/plugin/aws/sqs/AbstractSqs.java +++ b/src/main/java/io/kestra/plugin/aws/sqs/AbstractSqs.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.SuperBuilder; -import software.amazon.awssdk.awscore.retry.AwsRetryStrategy; +import software.amazon.awssdk.awscore.retry.AwsRetryPolicy; import software.amazon.awssdk.services.sqs.SqsAsyncClient; import software.amazon.awssdk.services.sqs.SqsAsyncClientBuilder; import software.amazon.awssdk.services.sqs.SqsClient; @@ -50,10 +50,10 @@ protected SqsAsyncClient asyncClient(final RunContext runContext, ); clientBuilder = clientBuilder.overrideConfiguration(builder -> - builder.retryStrategy( - AwsRetryStrategy.standardRetryStrategy() + builder.retryPolicy( + AwsRetryPolicy.defaultRetryPolicy() .toBuilder() - .maxAttempts(retryMaxAttempts) + .numRetries(retryMaxAttempts) .build() ) );