Upgrade Spring Cloud to 4.2.0 (#1290)

---------

Co-authored-by: matejnedic <[email protected]>

pom.xml

@@ -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>
 

spring-cloud-aws-dependencies/pom.xml

@@ -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>

spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sns/src/test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java

@@ -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;
@@ -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

spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sqs/src/test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java

@@ -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;
@@ -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