Upgrade AWS SDK to 2.25.10 (#1072)

awspring · Mar 18, 2024 · c77fa9a · c77fa9a
1 parent e81cc16
commit c77fa9a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 17 deletions.
diff --git a/spring-cloud-aws-autoconfigure/pom.xml b/spring-cloud-aws-autoconfigure/pom.xml
@@ -90,8 +90,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>software.amazon.awssdk.crt</groupId>
-			<artifactId>aws-crt</artifactId>
+			<groupId>software.amazon.awssdk</groupId>
+			<artifactId>aws-crt-client</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

diff --git a/...configure/src/test/java/io/awspring/cloud/autoconfigure/s3/ConfiguredTransferManager.java b/...configure/src/test/java/io/awspring/cloud/autoconfigure/s3/ConfiguredTransferManager.java
@@ -34,9 +34,7 @@ public class ConfiguredTransferManager {
 		// todo: this is getting too hacky
 		if (s3TransferManager.getClass().getName()
 				.equals("software.amazon.awssdk.transfer.s3.internal.CrtS3TransferManager")) {
-			S3TransferManager delegate = (S3TransferManager) ReflectionTestUtils.getField(s3TransferManager,
-					"delegate");
-			this.transferConfiguration = (TransferManagerConfiguration) ReflectionTestUtils.getField(delegate,
+			this.transferConfiguration = (TransferManagerConfiguration) ReflectionTestUtils.getField(s3TransferManager,
 					"transferConfiguration");
 			this.client = (S3AsyncClient) ReflectionTestUtils.getField(s3TransferManager, "s3AsyncClient");
 		}

diff --git a/spring-cloud-aws-dependencies/pom.xml b/spring-cloud-aws-dependencies/pom.xml
@@ -24,13 +24,12 @@
 
 	<properties>
 		<spotless.version>2.31.0</spotless.version>
-		<awssdk-v2.version>2.21.46</awssdk-v2.version>
+		<awssdk-v2.version>2.25.10</awssdk-v2.version>
 		<amazon.dax.version>2.0.4</amazon.dax.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<spring-cloud-commons.version>4.1.0</spring-cloud-commons.version>
 		<jakarta.mail.version>2.1.0</jakarta.mail.version>
 		<eclipse.jakarta.mail.version>1.0.0</eclipse.jakarta.mail.version>
-		<aws-crt.version>0.28.13</aws-crt.version>
 		<bytebuddy.version>1.14.9</bytebuddy.version>
 		<spring-modulith.version>1.1.2</spring-modulith.version>
 	</properties>
@@ -75,13 +74,6 @@
 				<optional>true</optional>
 			</dependency>
 
-			<dependency>
-				<groupId>software.amazon.awssdk.crt</groupId>
-				<artifactId>aws-crt</artifactId>
-				<version>${aws-crt.version}</version>
-				<optional>true</optional>
-			</dependency>
-
 			<dependency>
 				<groupId>io.awspring.cloud</groupId>
 				<artifactId>spring-cloud-aws-core</artifactId>

diff --git a/spring-cloud-aws-s3/pom.xml b/spring-cloud-aws-s3/pom.xml
@@ -32,8 +32,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>software.amazon.awssdk.crt</groupId>
-			<artifactId>aws-crt</artifactId>
+			<groupId>software.amazon.awssdk</groupId>
+			<artifactId>aws-crt-client</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

diff --git a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java
@@ -69,7 +69,7 @@ class S3ResourceIntegrationTests {
 
 	@Container
 	static LocalStackContainer localstack = new LocalStackContainer(
-			DockerImageName.parse("localstack/localstack:3.2.0")).withReuse(true);
+			DockerImageName.parse("localstack/localstack:3.2.0"));
 
 	private static S3Client client;
 	private static S3AsyncClient asyncClient;