From b7c3730319de0649928e953311d1482f948184d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 13:52:37 +0530 Subject: [PATCH] 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 --- aws-parameterstore-project/docker/docker-compose.yml | 2 +- aws-parameterstore-project/pom.xml | 2 +- .../main/java/com/example/awsspring/config/WebMvcConfig.java | 3 ++- .../src/test/java/com/example/awsspring/TestApplication.java | 2 +- .../example/awsspring/common/LocalStackContainerConfig.java | 2 +- aws-secretmanager-project/docker/docker-compose.yml | 2 +- aws-secretmanager-project/pom.xml | 2 +- .../main/java/com/example/awsspring/config/WebMvcConfig.java | 3 ++- .../src/test/java/com/example/awsspring/TestApplication.java | 2 +- .../java/com/example/awsspring/common/DBTestContainer.java | 2 +- .../example/awsspring/common/LocalStackContainerConfig.java | 2 +- .../example/awsspring/repositories/SchemaValidationTest.java | 3 --- aws-ses-project/docker/docker-compose.yml | 2 +- aws-ses-project/pom.xml | 2 +- .../main/java/com/example/awsspring/config/WebMvcConfig.java | 3 ++- .../com/example/awsspring/common/LocalStackTestContainer.java | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aws-parameterstore-project/docker/docker-compose.yml b/aws-parameterstore-project/docker/docker-compose.yml index 4e9a07ba..0782f717 100644 --- 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 index a3db2b9f..44b3d85c 100644 --- a/aws-parameterstore-project/pom.xml +++ b/aws-parameterstore-project/pom.xml @@ -241,7 +241,7 @@ - 1.22.0 + 1.25.2 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 index f93eb5dc..712977dd 100644 --- 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 index e95dac8a..c3a6a95e 100644 --- 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/aws-parameterstore-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java b/aws-parameterstore-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java index c9e7e384..e2469833 100644 --- a/aws-parameterstore-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java +++ b/aws-parameterstore-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 index 0384bffd..0146fa1e 100644 --- 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 index 0c8743d2..690cfb8a 100644 --- a/aws-secretmanager-project/pom.xml +++ b/aws-secretmanager-project/pom.xml @@ -236,7 +236,7 @@ - 1.22.0 + 1.25.2 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 index f93eb5dc..712977dd 100644 --- 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 index 21a4c6a5..142c6bb9 100644 --- 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 index c167817b..227047a5 100644 --- 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/aws-secretmanager-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java b/aws-secretmanager-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java index d34701d5..76b8d52a 100644 --- a/aws-secretmanager-project/src/test/java/com/example/awsspring/common/LocalStackContainerConfig.java +++ b/aws-secretmanager-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/aws-secretmanager-project/src/test/java/com/example/awsspring/repositories/SchemaValidationTest.java b/aws-secretmanager-project/src/test/java/com/example/awsspring/repositories/SchemaValidationTest.java index 9c1fa0a9..e80bea2d 100644 --- a/aws-secretmanager-project/src/test/java/com/example/awsspring/repositories/SchemaValidationTest.java +++ b/aws-secretmanager-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 index 08428451..7a29b814 100644 --- 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 index 33a833de..b630de5c 100644 --- a/aws-ses-project/pom.xml +++ b/aws-ses-project/pom.xml @@ -228,7 +228,7 @@ - 1.22.0 + 1.25.2 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 index f93eb5dc..712977dd 100644 --- 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 index f127d887..a196e2af 100644 --- 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);