Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade AWS SDK to 2.25.10 #1072

Merged
merged 5 commits into from
Mar 18, 2024
Merged

Upgrade AWS SDK to 2.25.10 #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e966ac1
Upgrade AWS SDK to 2.25.1
maciejwalkowiak Mar 4, 2024
35e4e19
remove `withServices`
maciejwalkowiak Mar 9, 2024
9651f43
Merge remote-tracking branch 'origin/main' into upgrade-aws-sdk
maciejwalkowiak Mar 17, 2024
6531f79
Upgrade to 2.25.10
maciejwalkowiak Mar 17, 2024
57a081d
Fix test
maciejwalkowiak Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions spring-cloud-aws-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions ...configure/src/test/java/io/awspring/cloud/autoconfigure/s3/ConfiguredTransferManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
10 changes: 1 addition & 9 deletions spring-cloud-aws-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-aws-s3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading