Skip to content

Commit 40bf296

Browse files
MatejNedicMatejNedic
authored
Lift aws SDK version (awspring#1647)
1 parent 419f4cd commit 40bf296

12 files changed

Lines changed: 47 additions & 38 deletions

File tree

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
5151
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
5252
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
53-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
53+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
5454
import software.amazon.awssdk.services.ssm.SsmClient;
5555
import software.amazon.awssdk.services.ssm.model.GetParametersByPathRequest;
5656
import software.amazon.awssdk.services.ssm.model.GetParametersByPathResponse;
@@ -560,7 +560,8 @@ public void initialize(BootstrapRegistry registry) {
560560
}));
561561
}));
562562
registry.register(AwsSyncClientCustomizer.class, context -> (builder -> {
563-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
563+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
564+
.socketTimeout(Duration.ofSeconds(30)).build());
564565
}));
565566
}
566567
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/SsmClientCustomizerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.core.annotation.Order;
32-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
32+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3333
import software.amazon.awssdk.services.ssm.SsmClient;
3434

3535
/**
@@ -92,7 +92,8 @@ SsmClientCustomizer customizer2() {
9292
@Bean
9393
AwsSyncClientCustomizer awsSyncClientCustomizer() {
9494
return builder -> {
95-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
95+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
96+
.socketTimeout(Duration.ofSeconds(30)).build());
9697
};
9798
}
9899
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLoaderIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder;
5353
import software.amazon.awssdk.core.sync.RequestBody;
5454
import software.amazon.awssdk.http.SdkHttpClient;
55-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
55+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
5656
import software.amazon.awssdk.regions.Region;
5757
import software.amazon.awssdk.services.s3.S3Client;
5858
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
@@ -263,7 +263,7 @@ public void initialize(BootstrapRegistry registry) {
263263
}));
264264
}));
265265

266-
SdkHttpClient mock = spy(ApacheHttpClient.builder().build());
266+
SdkHttpClient mock = spy(Apache5HttpClient.builder().build());
267267
when(mock.clientName()).thenReturn("mock-client");
268268

269269
registry.register(SdkHttpClient.class, context -> mock);

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerClientCustomizerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.core.annotation.Order;
32-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
32+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3333
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
3434

3535
/**
@@ -92,7 +92,8 @@ SecretsManagerClientCustomizer customizer2() {
9292
@Bean
9393
AwsSyncClientCustomizer awsSyncClientCustomizer() {
9494
return builder -> {
95-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
95+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
96+
.socketTimeout(Duration.ofSeconds(30)).build());
9697
};
9798
}
9899
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
5757
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
5858
import software.amazon.awssdk.core.SdkBytes;
59-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
59+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
6060
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
6161
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueRequest;
6262
import software.amazon.awssdk.services.secretsmanager.model.GetSecretValueResponse;
@@ -554,7 +554,7 @@ public void initialize(BootstrapRegistry registry) {
554554
}));
555555
}));
556556
registry.register(AwsSyncClientCustomizer.class, context -> (builder -> {
557-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
557+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
558558
}));
559559
}
560560
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/dynamodb/DynamoDbClientCustomizerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.core.annotation.Order;
32-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
32+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3333
import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
3434

3535
/**
@@ -92,7 +92,8 @@ DynamoDbClientCustomizer dynamoDbClientCustomizer2() {
9292
@Bean
9393
AwsSyncClientCustomizer commonAwsSyncClientCustomizer() {
9494
return builder -> {
95-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
95+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
96+
.socketTimeout(Duration.ofSeconds(30)).build());
9697
};
9798
}
9899
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/s3/S3ClientCustomizerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.core.annotation.Order;
33-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
33+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3434
import software.amazon.awssdk.services.s3.S3Client;
3535
import software.amazon.encryption.s3.S3EncryptionClient;
3636

@@ -95,7 +95,8 @@ S3ClientCustomizer customizer2() {
9595
@Bean
9696
AwsSyncClientCustomizer awsSyncClientCustomizer() {
9797
return builder -> {
98-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
98+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
99+
.socketTimeout(Duration.ofSeconds(30)).build());
99100
};
100101
}
101102
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/ses/SesClientCustomizerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.core.annotation.Order;
32-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
32+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3333
import software.amazon.awssdk.services.ses.SesClient;
3434

3535
/**
@@ -92,7 +92,8 @@ SesClientCustomizer customizer2() {
9292
@Bean
9393
AwsSyncClientCustomizer awsSyncClientCustomizer() {
9494
return builder -> {
95-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
95+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
96+
.socketTimeout(Duration.ofSeconds(30)).build());
9697
};
9798
}
9899
}

‎spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/sns/SnsClientCustomizerTests.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
3131
import org.springframework.core.annotation.Order;
32-
import software.amazon.awssdk.http.apache.ApacheHttpClient;
32+
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
3333
import software.amazon.awssdk.services.sns.SnsClient;
3434

3535
/**
@@ -92,7 +92,8 @@ SnsClientCustomizer customizer2() {
9292
@Bean
9393
AwsSyncClientCustomizer awsSyncClientCustomizer() {
9494
return builder -> {
95-
builder.httpClient(ApacheHttpClient.builder().connectionTimeout(Duration.ofMillis(1542)).build());
95+
builder.httpClient(Apache5HttpClient.builder().connectionTimeout(Duration.ofMillis(1542))
96+
.socketTimeout(Duration.ofSeconds(30)).build());
9697
};
9798
}
9899
}

‎spring-cloud-aws-dependencies/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424

2525
<properties>
2626
<spotless.version>2.31.0</spotless.version>
27-
<awssdk-v2.version>2.42.36</awssdk-v2.version>
28-
<kcl.version>3.1.2</kcl.version>
29-
<kpl.version>1.0.4</kpl.version>
30-
<amazon.dax.version>2.0.7</amazon.dax.version>
31-
<dynamodb-streams.version>2.0.1</dynamodb-streams.version>
32-
<amazon.encryption.s3.version>4.0.0</amazon.encryption.s3.version>
27+
<awssdk-v2.version>2.47.4</awssdk-v2.version>
28+
<kcl.version>3.5.0</kcl.version>
29+
<kpl.version>1.0.7</kpl.version>
30+
<amazon.dax.version>2.0.10</amazon.dax.version>
31+
<dynamodb-streams.version>2.3.0</dynamodb-streams.version>
32+
<amazon.encryption.s3.version>4.0.1</amazon.encryption.s3.version>
3333
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
3434
<spring-cloud-commons.version>5.0.0</spring-cloud-commons.version>
3535
<spring-cloud-stream.version>5.0.0</spring-cloud-stream.version>
3636
<jakarta.mail.version>2.1.3</jakarta.mail.version>
3737
<eclipse.jakarta.mail.version>2.0.3</eclipse.jakarta.mail.version>
3838
<spring-modulith.version>2.0.0</spring-modulith.version>
39-
<amazon.s3.accessgrants>2.3.0</amazon.s3.accessgrants>
39+
<amazon.s3.accessgrants>2.4.1</amazon.s3.accessgrants>
4040
<amazon.sqs.extended.client>2.1.2</amazon.sqs.extended.client>
4141
</properties>
4242

0 commit comments

Comments
 (0)