From 68845ec7b2556dbf350aab0bad1f51b09d9f6b0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 04:23:36 +0000 Subject: [PATCH 1/2] build(deps): bump test-containers.version from 1.17.6 to 1.19.7 Bumps `test-containers.version` from 1.17.6 to 1.19.7. Updates `org.testcontainers:testcontainers` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:mongodb` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:vault` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:localstack` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:oracle-xe` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:mysql` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:postgresql` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:mssqlserver` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:solr` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) Updates `org.testcontainers:elasticsearch` from 1.17.6 to 1.19.7 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.6...1.19.7) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:mongodb dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:vault dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.testcontainers:localstack dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:oracle-xe dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:mysql dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:mssqlserver dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.testcontainers:solr dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: org.testcontainers:elasticsearch dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}/ From 6e2d10755044898a8251412827a9ea26d55fe052 Mon Sep 17 00:00:00 2001 From: Paul Warren Date: Wed, 6 Mar 2024 20:58:56 -0800 Subject: [PATCH 2/2] refactor: use new S3Client builder APIs - old ones have been removed --- .../springframework/content/s3/it/LocalStack.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 5da779ea5..a080062c8 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.services.s3.S3Client; public class LocalStack extends LocalStackContainer implements Serializable { @@ -37,8 +40,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())) + .endpointOverride(LocalStack.singleton().getEndpoint()) + .credentialsProvider( + StaticCredentialsProvider.create( + AwsBasicCredentials.create(LocalStack.singleton().getAccessKey(), LocalStack.singleton().getSecretKey()) + ) + ) + .region(Region.of(LocalStack.singleton().getRegion())) .build(); }