chore(deps) : upgrade to postgres 16.3-alpine (#1226)

* chore(deps) : upgrade to postgres 16.3-alpine * feat : use testcontainers in dev mode * fix : sync with other declarations
rajadilipkolli · May 10, 2024 · cb6896e · cb6896e
1 parent 5f36cb3
commit cb6896e
Show file tree

Hide file tree

Showing 24 changed files with 60 additions and 54 deletions.
diff --git a/...h-boot-jpa-sample/src/test/java/com/example/bootbatchjpa/common/TestContainersConfig.java b/...h-boot-jpa-sample/src/test/java/com/example/bootbatchjpa/common/TestContainersConfig.java
@@ -2,9 +2,11 @@
 
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 public interface TestContainersConfig {
 
     @ServiceConnection
-    PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.2-alpine");
+    PostgreSQLContainer<?> postgreSQLContainer =
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
 }
diff --git a/boot-api-archunit-sample/src/test/java/com/example/archunit/common/ContainersConfig.java b/boot-api-archunit-sample/src/test/java/com/example/archunit/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 }
diff --git a/boot-choas-monkey/src/test/java/com/example/choasmonkey/TestApplication.java b/boot-choas-monkey/src/test/java/com/example/choasmonkey/TestApplication.java
@@ -6,6 +6,7 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestApplication {
@@ -14,7 +15,7 @@ public class TestApplication {
     @ServiceConnection
     @RestartScope
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.2-alpine");
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 
     public static void main(String[] args) {

diff --git a/boot-rest-docs-sample/src/test/java/com/example/restdocs/TestApplication.java b/boot-rest-docs-sample/src/test/java/com/example/restdocs/TestApplication.java
@@ -5,14 +5,15 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestApplication {
 
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.2-alpine");
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 
     public static void main(String[] args) {

diff --git a/...-graphql-querydsl/src/test/java/com/example/graphql/querydsl/common/ContainersConfig.java b/...-graphql-querydsl/src/test/java/com/example/graphql/querydsl/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine")).withReuse(true);
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine")).withReuse(true);
     }
 }
diff --git a/graphql/boot-graphql-webflux/src/test/java/com/example/graphql/TestApplication.java b/graphql/boot-graphql-webflux/src/test/java/com/example/graphql/TestApplication.java
@@ -5,14 +5,15 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestApplication {
 
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.2-alpine");
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 
     public static void main(String[] args) {

diff --git a/...ql/boot-graphql-webmvc/src/test/java/com/example/graphql/common/TestContainersConfig.java b/...ql/boot-graphql-webmvc/src/test/java/com/example/graphql/common/TestContainersConfig.java
@@ -2,9 +2,11 @@
 
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 public interface TestContainersConfig {
 
     @ServiceConnection
-    PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.2-alpine");
+    PostgreSQLContainer<?> postgreSQLContainer =
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
 }
diff --git a/jpa/boot-data-envers/src/test/java/com/example/envers/common/ContainersConfig.java b/jpa/boot-data-envers/src/test/java/com/example/envers/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 }
diff --git a/...keyset-pagination/src/test/java/com/example/keysetpagination/common/ContainersConfig.java b/...keyset-pagination/src/test/java/com/example/keysetpagination/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 }
diff --git a/...datasources/src/test/java/com/example/multipledatasources/ApplicationIntegrationTest.java b/...datasources/src/test/java/com/example/multipledatasources/ApplicationIntegrationTest.java
@@ -17,6 +17,7 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
@@ -28,7 +29,7 @@ class ApplicationIntegrationTest {
 
     @Container
     private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER =
-            new PostgreSQLContainer<>("postgres:16.2-alpine");
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
 
     @DynamicPropertySource
     static void registerDynamicProperties(DynamicPropertyRegistry registry) {

diff --git a/jpa/boot-jpa-locks/src/test/java/com/example/locks/common/ContainersConfig.java b/jpa/boot-jpa-locks/src/test/java/com/example/locks/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.2-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.3-alpine"));
     }
 }
diff --git a/...ce-multitenancy/src/test/java/com/example/multitenancy/common/DBContainerInitializer.java b/...ce-multitenancy/src/test/java/com/example/multitenancy/common/DBContainerInitializer.java
@@ -10,7 +10,7 @@
 public class DBContainerInitializer {
 
     private static final PostgreSQLContainer<?> POSTGRE_SQL_CONTAINER =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.1-alpine"))
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.3-alpine"))
                     .withReuse(true);
 
     private static final OracleContainer ORACLE_CONTAINER =

diff --git a/...titenancy-db/src/test/java/com/example/multitenancy/db/common/DBContainerInitializer.java b/...titenancy-db/src/test/java/com/example/multitenancy/db/common/DBContainerInitializer.java
@@ -6,12 +6,13 @@
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
 import org.testcontainers.lifecycle.Startables;
+import org.testcontainers.utility.DockerImageName;
 
 public class DBContainerInitializer
         implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
     private static final PostgreSQLContainer<?> sqlContainer =
-            new PostgreSQLContainer<>("postgres:16.1-alpine");
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
 
     private static final MariaDBContainer<?> mariaDBContainer = new MariaDBContainer<>("mariadb");
 

diff --git a/jpa/multitenancy/partition/pom.xml b/jpa/multitenancy/partition/pom.xml
@@ -89,8 +89,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -234,7 +234,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.17.0</version>
+                            <version>1.19.2</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>

diff --git a/...titenancy/partition/src/test/java/com/example/multitenancy/partition/TestApplication.java b/...titenancy/partition/src/test/java/com/example/multitenancy/partition/TestApplication.java
@@ -0,0 +1,22 @@
+package com.example.multitenancy.partition;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.context.annotation.Bean;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
+
+@TestConfiguration(proxyBeanMethods = false)
+public class TestApplication {
+
+    @Bean
+    @ServiceConnection
+    PostgreSQLContainer<?> postgreSQLContainer() {
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.from(Application::main).with(TestApplication.class).run(args);
+    }
+}
diff --git a/...tion/src/test/java/com/example/multitenancy/partition/common/AbstractIntegrationTest.java b/...tion/src/test/java/com/example/multitenancy/partition/common/AbstractIntegrationTest.java
@@ -3,17 +3,16 @@
 import static com.example.multitenancy.partition.utils.AppConstants.PROFILE_TEST;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
+import com.example.multitenancy.partition.TestApplication;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 
 @ActiveProfiles({PROFILE_TEST})
-@SpringBootTest(webEnvironment = RANDOM_PORT)
-@ContextConfiguration(initializers = {DBContainerInitializer.class})
+@SpringBootTest(webEnvironment = RANDOM_PORT, classes = TestApplication.class)
 @AutoConfigureMockMvc
 public abstract class AbstractIntegrationTest {
 

diff --git a/...ition/src/test/java/com/example/multitenancy/partition/common/DBContainerInitializer.java b/...ition/src/test/java/com/example/multitenancy/partition/common/DBContainerInitializer.java
diff --git a/...ema/src/test/java/com/example/multitenancy/schema/config/TestContainersConfiguration.java b/...ema/src/test/java/com/example/multitenancy/schema/config/TestContainersConfiguration.java
@@ -5,6 +5,7 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestContainersConfiguration {
@@ -13,6 +14,6 @@ public class TestContainersConfiguration {
     @ServiceConnection
     @RestartScope
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.1-alpine");
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 }
diff --git a/r2dbc/boot-jooq-r2dbc-sample/src/test/java/com/example/jooq/r2dbc/TestApplication.java b/r2dbc/boot-jooq-r2dbc-sample/src/test/java/com/example/jooq/r2dbc/TestApplication.java
@@ -5,6 +5,7 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.MountableFile;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -13,7 +14,7 @@ public class TestApplication {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.2-alpine")
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"))
                 .withCopyFileToContainer(
                         MountableFile.forClasspathResource("init.sql"),
                         "/docker-entrypoint-initdb.d/init.sql");

diff --git a/r2dbc/boot-r2dbc-sample/src/test/java/com/example/bootr2dbc/TestApplication.java b/r2dbc/boot-r2dbc-sample/src/test/java/com/example/bootr2dbc/TestApplication.java
@@ -5,14 +5,15 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestApplication {
 
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.2-alpine");
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 
     public static void main(String[] args) {

diff --git a/scheduler/boot-jobrunr-sample/src/test/java/com/example/jobrunr/TestApplication.java b/scheduler/boot-jobrunr-sample/src/test/java/com/example/jobrunr/TestApplication.java
@@ -5,14 +5,15 @@
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.utility.DockerImageName;
 
 @TestConfiguration(proxyBeanMethods = false)
 public class TestApplication {
 
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.1-alpine");
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 
     public static void main(String[] args) {

diff --git a/...ler/boot-scheduler-quartz/src/test/java/com/scheduler/quartz/common/ContainersConfig.java b/...ler/boot-scheduler-quartz/src/test/java/com/scheduler/quartz/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 }
diff --git a/scheduler/boot-shedlock-sample/src/test/java/com/learning/shedlock/SchemaValidationTest.java b/scheduler/boot-shedlock-sample/src/test/java/com/learning/shedlock/SchemaValidationTest.java
@@ -7,7 +7,7 @@
         properties = {
             "spring.jpa.hibernate.ddl-auto=validate",
             "spring.test.database.replace=none",
-            "spring.datasource.url=jdbc:tc:postgresql:16.2-alpine:///db"
+            "spring.datasource.url=jdbc:tc:postgresql:16.3-alpine:///db"
         })
 class SchemaValidationTest {
 

diff --git a/...ler/boot-shedlock-sample/src/test/java/com/learning/shedlock/common/ContainersConfig.java b/...ler/boot-shedlock-sample/src/test/java/com/learning/shedlock/common/ContainersConfig.java
@@ -12,6 +12,6 @@ public class ContainersConfig {
     @Bean
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.3-alpine"));
     }
 }