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

Upgrade Spring Cloud to 4.2.0 #1290

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Upgrade Spring Cloud to 4.2.0 #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb494d6
Upgrade Spring Cloud to 4.2.0
abilng Dec 3, 2024
4fb7fc7
Update release version
MatejNedic Dec 8, 2024
b8ad0e2
Fix failing test
MatejNedic Dec 8, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.2.0-M2</version>
<version>4.2.0</version>
<relativePath/><!-- lookup parent from repository -->
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-aws-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<amazon.dax.version>2.0.5</amazon.dax.version>
<amazon.encryption.s3.version>3.2.3</amazon.encryption.s3.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<spring-cloud-commons.version>4.2.0-M2</spring-cloud-commons.version>
<spring-cloud-commons.version>4.2.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>
<bytebuddy.version>1.14.9</bytebuddy.version>
Expand Down
22 changes: 12 additions & 10 deletions .../test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.modulith.events.ApplicationModuleListener;
import org.springframework.modulith.events.Externalized;
import org.springframework.test.context.DynamicPropertyRegistrar;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.transaction.annotation.Transactional;
import org.testcontainers.containers.localstack.LocalStackContainer;
Expand Down Expand Up @@ -55,16 +56,17 @@ class SnsEventPublicationIntegrationTests {
static class TestConfiguration {

@Bean
LocalStackContainer localStackContainer(DynamicPropertyRegistry registry) {

var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.8.1"));

registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint);
registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey);
registry.add("spring.cloud.aws.credentials.secret-key", localstack::getSecretKey);
registry.add("spring.cloud.aws.region.static", localstack::getRegion);

return localstack;
DynamicPropertyRegistrar dynamicPropertyRegistrar(LocalStackContainer localstack) {
return registry -> {
registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint);
registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey);
registry.add("spring.cloud.aws.credentials.secret-key", localstack::getSecretKey);
registry.add("spring.cloud.aws.region.static", localstack::getRegion);
};
}
@Bean
LocalStackContainer localStackContainer() {
return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.8.1"));
}

@Bean
Expand Down
22 changes: 12 additions & 10 deletions .../test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.springframework.context.annotation.Bean;
import org.springframework.modulith.events.ApplicationModuleListener;
import org.springframework.modulith.events.Externalized;
import org.springframework.test.context.DynamicPropertyRegistrar;
import org.springframework.test.context.DynamicPropertyRegistry;
import org.springframework.transaction.annotation.Transactional;
import org.testcontainers.containers.localstack.LocalStackContainer;
Expand All @@ -53,16 +54,17 @@ class SqsEventPublicationIntegrationTests {
static class TestConfiguration {

@Bean
LocalStackContainer localStackContainer(DynamicPropertyRegistry registry) {

var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.8.1"));

registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint);
registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey);
registry.add("spring.cloud.aws.credentials.secret-key", localstack::getSecretKey);
registry.add("spring.cloud.aws.region.static", localstack::getRegion);

return localstack;
DynamicPropertyRegistrar dynamicPropertyRegistrar(LocalStackContainer localstack) {
return registry -> {
registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint);
registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey);
registry.add("spring.cloud.aws.credentials.secret-key", localstack::getSecretKey);
registry.add("spring.cloud.aws.region.static", localstack::getRegion);
};
}
@Bean
LocalStackContainer localStackContainer() {
return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.8.1"));
}

@Bean
Expand Down
Loading