chore(deps): update localstack/localstack docker tag to v4 (#800)

* chore(deps): update localstack/localstack docker tag to v4 * polish * adds missing file --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Kolli <[email protected]>
rajadilipkolli · Dec 27, 2024 · b7c3730 · b7c3730
1 parent a78f768
commit b7c3730
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/aws-parameterstore-project/docker/docker-compose.yml b/aws-parameterstore-project/docker/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - "5432:5432"
 
   localstack:
-    image: localstack/localstack:3.8.1
+    image: localstack/localstack:4.0.3
     ports:
       - "4566:4566"
     environment:

diff --git a/aws-parameterstore-project/pom.xml b/aws-parameterstore-project/pom.xml
@@ -241,7 +241,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.22.0</version>
+                            <version>1.25.2</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>

diff --git a/aws-parameterstore-project/src/main/java/com/example/awsspring/config/WebMvcConfig.java b/aws-parameterstore-project/src/main/java/com/example/awsspring/config/WebMvcConfig.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -11,7 +12,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     private final ApplicationProperties properties;
 
     @Override
-    public void addCorsMappings(CorsRegistry registry) {
+    public void addCorsMappings(@NonNull CorsRegistry registry) {
         registry.addMapping(properties.getCors().getPathPattern())
                 .allowedMethods(properties.getCors().getAllowedMethods())
                 .allowedHeaders(properties.getCors().getAllowedHeaders())

diff --git a/aws-parameterstore-project/src/test/java/com/example/awsspring/TestApplication.java b/aws-parameterstore-project/src/test/java/com/example/awsspring/TestApplication.java
@@ -13,7 +13,7 @@ public class TestApplication {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> sqlContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:17.0-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:17.2-alpine"));
     }
 
     public static void main(String[] args) {

diff --git a/...erstore-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java b/...erstore-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java
@@ -14,7 +14,7 @@ public class LocalStackContainerConfig {
 
     @Container
     private static final LocalStackContainer localStackContainer =
-            new LocalStackContainer(DockerImageName.parse("localstack/localstack").withTag("3.7.2"))
+            new LocalStackContainer(DockerImageName.parse("localstack/localstack").withTag("4.0.3"))
                     .withCopyFileToContainer(
                             MountableFile.forHostPath("localstack/"),
                             "/etc/localstack/init/ready.d/")

diff --git a/aws-secretmanager-project/docker/docker-compose.yml b/aws-secretmanager-project/docker/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - "5432:5432"
 
   localstack:
-    image: localstack/localstack:3.8.1
+    image: localstack/localstack:4.0.3
     ports:
       - "4566:4566"
     environment:

diff --git a/aws-secretmanager-project/pom.xml b/aws-secretmanager-project/pom.xml
@@ -236,7 +236,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.22.0</version>
+                            <version>1.25.2</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                         <formatAnnotations />

diff --git a/aws-secretmanager-project/src/main/java/com/example/awsspring/config/WebMvcConfig.java b/aws-secretmanager-project/src/main/java/com/example/awsspring/config/WebMvcConfig.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -11,7 +12,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     private final ApplicationProperties properties;
 
     @Override
-    public void addCorsMappings(CorsRegistry registry) {
+    public void addCorsMappings(@NonNull CorsRegistry registry) {
         registry.addMapping(properties.getCors().getPathPattern())
                 .allowedMethods(properties.getCors().getAllowedMethods())
                 .allowedHeaders(properties.getCors().getAllowedHeaders())

diff --git a/aws-secretmanager-project/src/test/java/com/example/awsspring/TestApplication.java b/aws-secretmanager-project/src/test/java/com/example/awsspring/TestApplication.java
@@ -19,7 +19,7 @@ public class TestApplication {
     @ServiceConnection
     LocalStackContainer localStackContainer() {
         return new LocalStackContainer(
-                        DockerImageName.parse("localstack/localstack").withTag("3.7.2"))
+                        DockerImageName.parse("localstack/localstack").withTag("4.0.3"))
                 .withCopyFileToContainer(
                         MountableFile.forHostPath("localstack/"), "/etc/localstack/init/ready.d/")
                 .waitingFor(Wait.forLogMessage(".*LocalStack initialized successfully\n", 1));

diff --git a/aws-secretmanager-project/src/test/java/com/example/awsspring/common/DBTestContainer.java b/aws-secretmanager-project/src/test/java/com/example/awsspring/common/DBTestContainer.java
@@ -9,5 +9,5 @@ public interface DBTestContainer {
 
     @Container @ServiceConnection
     PostgreSQLContainer<?> sqlContainer =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.0-alpine"));
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
 }
diff --git a/...manager-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java b/...manager-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java
@@ -14,7 +14,7 @@ public class LocalStackContainerConfig {
 
     @Container
     private static final LocalStackContainer localStackContainer =
-            new LocalStackContainer(DockerImageName.parse("localstack/localstack").withTag("3.7.1"))
+            new LocalStackContainer(DockerImageName.parse("localstack/localstack").withTag("4.0.3"))
                     .withCopyFileToContainer(
                             MountableFile.forHostPath("localstack/"),
                             "/etc/localstack/init/ready.d/")

diff --git a/...anager-project/src/test/java/com/example/awsspring/repositories/SchemaValidationTest.java b/...anager-project/src/test/java/com/example/awsspring/repositories/SchemaValidationTest.java
@@ -7,13 +7,10 @@
 import javax.sql.DataSource;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.testcontainers.context.ImportTestcontainers;
 
 @DataJpaTest(properties = "spring.jpa.hibernate.ddl-auto=validate")
-@AutoConfigureTestDatabase(replace = Replace.NONE)
 @ImportTestcontainers(DBTestContainer.class)
 class SchemaValidationTest {
 

diff --git a/aws-ses-project/docker/docker-compose.yml b/aws-ses-project/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   localstack:
-    image: localstack/localstack:3.8.1
+    image: localstack/localstack:4.0.3
     ports:
       - "4566:4566"
     environment:

diff --git a/aws-ses-project/pom.xml b/aws-ses-project/pom.xml
@@ -228,7 +228,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.22.0</version>
+                            <version>1.25.2</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>

diff --git a/aws-ses-project/src/main/java/com/example/awsspring/config/WebMvcConfig.java b/aws-ses-project/src/main/java/com/example/awsspring/config/WebMvcConfig.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -11,7 +12,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     private final ApplicationProperties properties;
 
     @Override
-    public void addCorsMappings(CorsRegistry registry) {
+    public void addCorsMappings(@NonNull CorsRegistry registry) {
         registry.addMapping(properties.getCors().getPathPattern())
                 .allowedMethods(properties.getCors().getAllowedMethods())
                 .allowedHeaders(properties.getCors().getAllowedHeaders())

diff --git a/aws-ses-project/src/test/java/com/example/awsspring/common/LocalStackTestContainer.java b/aws-ses-project/src/test/java/com/example/awsspring/common/LocalStackTestContainer.java
@@ -17,7 +17,7 @@ public class LocalStackTestContainer {
     LocalStackContainer localStackContainer() {
         LocalStackContainer localStackContainer =
                 new LocalStackContainer(
-                        DockerImageName.parse("localstack/localstack").withTag("3.7.2"));
+                        DockerImageName.parse("localstack/localstack").withTag("4.0.3"));
         localStackContainer.start();
         Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(log);
         localStackContainer.followOutput(logConsumer);