diff --git a/pom.xml b/pom.xml index b2dc5e237..2e59dbc44 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ Integrates with Spring Data, Spring Data REST and Apache Solr 7.17.18 - 1.17.6 + 1.19.7 3.12.4 ../target/generated-docs/refs/${env.BUILD_TYPE}/ diff --git a/spring-content-s3/src/test/java/internal/org/springframework/content/s3/it/LocalStack.java b/spring-content-s3/src/test/java/internal/org/springframework/content/s3/it/LocalStack.java index a45005b20..ca95e7864 100644 --- a/spring-content-s3/src/test/java/internal/org/springframework/content/s3/it/LocalStack.java +++ b/spring-content-s3/src/test/java/internal/org/springframework/content/s3/it/LocalStack.java @@ -4,6 +4,7 @@ import java.net.URI; import java.net.URISyntaxException; +import net.bytebuddy.asm.Advice; import org.testcontainers.containers.localstack.LocalStackContainer; import org.testcontainers.utility.DockerImageName; @@ -14,6 +15,8 @@ import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; +import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; +import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.core.ServiceConfiguration; import software.amazon.awssdk.services.s3.S3Client; @@ -38,9 +41,13 @@ public static LocalStack singleton() { public static S3Client getAmazonS3Client() throws URISyntaxException { return S3Client.builder() - .endpointOverride(new URI(LocalStack.singleton().getEndpointConfiguration(LocalStackContainer.Service.S3).getServiceEndpoint())) - .credentialsProvider(new LocalStack.CrossAwsCredentialsProvider(LocalStack.singleton().getDefaultCredentialsProvider())) - .serviceConfiguration((serviceBldr) -> {serviceBldr.pathStyleAccessEnabled(true);}) + .endpointOverride(LocalStack.singleton().getEndpoint()) + .credentialsProvider( + StaticCredentialsProvider.create( + AwsBasicCredentials.create(LocalStack.singleton().getAccessKey(), LocalStack.singleton().getSecretKey()) + ) + ) + .region(Region.of(LocalStack.singleton().getRegion())) .build(); }