chore(deps): update postgres docker tag to v17 (#1428)

* chore(deps): update postgres docker tag to v17 * upgrades tests --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Kolli <[email protected]>
rajadilipkolli · Dec 12, 2024 · e015c95 · e015c95
1 parent ee8d07d
commit e015c95
Show file tree

Hide file tree

Showing 17 changed files with 51 additions and 85 deletions.
diff --git a/batch-boot-jpa-sample/docker/docker-compose.yml b/batch-boot-jpa-sample/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   postgresqldb:
-    image: postgres:16.6-alpine
+    image: postgres:17.2-alpine
     hostname: postgresqldb
     extra_hosts: [ 'host.docker.internal:host-gateway' ]
     environment:

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
@@ -8,5 +8,5 @@ public interface TestContainersConfig {
 
     @ServiceConnection
     PostgreSQLContainer<?> postgreSQLContainer =
-            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("16.4-alpine"));
+            new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       - MYSQL_DATABASE=mydatabase
 
   postgres:
-    image: postgres:16.6-alpine
+    image: postgres:17.2-alpine
     ports:
       - "5432:5432"
     volumes:

diff --git a/httpClients/boot-http-proxy/docker/docker-compose.yml b/httpClients/boot-http-proxy/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   postgresqldb:
-    image: postgres:16.6-alpine
+    image: postgres:17.2-alpine
     environment:
       - POSTGRES_USER=appuser
       - POSTGRES_PASSWORD=secret

diff --git a/httpClients/boot-http-proxy/pom.xml b/httpClients/boot-http-proxy/pom.xml
@@ -221,7 +221,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.22.0</version>
+                            <version>1.25.0</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>

diff --git a/httpClients/boot-http-proxy/src/test/java/com/example/rest/proxy/TestApplication.java b/httpClients/boot-http-proxy/src/test/java/com/example/rest/proxy/TestApplication.java
@@ -1,23 +1,11 @@
 package com.example.rest.proxy;
 
+import com.example.rest.proxy.common.ContainersConfig;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.devtools.restart.RestartScope;
-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;
 
-@TestConfiguration(proxyBeanMethods = false)
-public class TestApplication {
-
-    @Bean
-    @ServiceConnection
-    @RestartScope
-    PostgreSQLContainer<?> postgresContainer() {
-        return new PostgreSQLContainer<>("postgres:16.3-alpine");
-    }
+class TestApplication {
 
     public static void main(String[] args) {
-        SpringApplication.from(Application::main).with(TestApplication.class).run(args);
+        SpringApplication.from(Application::main).with(ContainersConfig.class).run(args);
     }
 }
diff --git a/.../boot-http-proxy/src/test/java/com/example/rest/proxy/common/AbstractIntegrationTest.java b/.../boot-http-proxy/src/test/java/com/example/rest/proxy/common/AbstractIntegrationTest.java
@@ -3,7 +3,6 @@
 import static com.example.rest.proxy.utils.AppConstants.PROFILE_TEST;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
-import com.example.rest.proxy.TestApplication;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -12,7 +11,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 
 @ActiveProfiles({PROFILE_TEST})
-@SpringBootTest(webEnvironment = RANDOM_PORT, classes = TestApplication.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT, classes = ContainersConfig.class)
 @AutoConfigureMockMvc
 public abstract class AbstractIntegrationTest {
 

diff --git a/...Clients/boot-http-proxy/src/test/java/com/example/rest/proxy/common/ContainersConfig.java b/...Clients/boot-http-proxy/src/test/java/com/example/rest/proxy/common/ContainersConfig.java
@@ -0,0 +1,19 @@
+package com.example.rest.proxy.common;
+
+import org.springframework.boot.devtools.restart.RestartScope;
+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 ContainersConfig {
+
+    @Bean
+    @ServiceConnection
+    @RestartScope
+    PostgreSQLContainer<?> postgresContainer() {
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
+    }
+}
diff --git a/httpClients/boot-rest-template/docker/docker-compose.yml b/httpClients/boot-rest-template/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   postgresqldb:
-    image: postgres:16.6-alpine
+    image: postgres:17.2-alpine
     environment:
       - POSTGRES_USER=appuser
       - POSTGRES_PASSWORD=secret

diff --git a/httpClients/boot-rest-template/pom.xml b/httpClients/boot-rest-template/pom.xml
@@ -220,7 +220,7 @@
                 <configuration>
                     <java>
                         <googleJavaFormat>
-                            <version>1.22.0</version>
+                            <version>1.25.0</version>
                             <style>AOSP</style>
                         </googleJavaFormat>
                     </java>

diff --git a/httpClients/boot-rest-template/src/test/java/com/example/rest/template/TestApplication.java b/httpClients/boot-rest-template/src/test/java/com/example/rest/template/TestApplication.java
@@ -1,21 +1,11 @@
 package com.example.rest.template;
 
+import com.example.rest.template.common.ContainersConfig;
 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;
 
-@TestConfiguration(proxyBeanMethods = false)
-public class TestApplication {
-
-    @ServiceConnection
-    @Bean
-    PostgreSQLContainer<?> postgreSQLContainer() {
-        return new PostgreSQLContainer<>("postgres:16.3-alpine");
-    }
+class TestApplication {
 
     public static void main(String[] args) {
-        SpringApplication.from(Application::main).with(TestApplication.class).run(args);
+        SpringApplication.from(Application::main).with(ContainersConfig.class).run(args);
     }
 }
diff --git a/...rest-template/src/test/java/com/example/rest/template/common/AbstractIntegrationTest.java b/...rest-template/src/test/java/com/example/rest/template/common/AbstractIntegrationTest.java
@@ -3,7 +3,6 @@
 import static com.example.rest.template.utils.AppConstants.PROFILE_TEST;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
-import com.example.rest.template.TestApplication;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -12,7 +11,7 @@
 import org.springframework.test.web.servlet.MockMvc;
 
 @ActiveProfiles({PROFILE_TEST})
-@SpringBootTest(webEnvironment = RANDOM_PORT, classes = TestApplication.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT, classes = ContainersConfig.class)
 @AutoConfigureMockMvc
 public abstract class AbstractIntegrationTest {
 

diff --git a/...s/boot-rest-template/src/test/java/com/example/rest/template/common/ContainersConfig.java b/...s/boot-rest-template/src/test/java/com/example/rest/template/common/ContainersConfig.java
@@ -0,0 +1,17 @@
+package com.example.rest.template.common;
+
+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 ContainersConfig {
+
+    @Bean
+    @ServiceConnection
+    PostgreSQLContainer<?> postgresContainer() {
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
+    }
+}
diff --git a/httpClients/boot-web-client-mvc/docker/docker-compose-app.yml b/httpClients/boot-web-client-mvc/docker/docker-compose-app.yml
@@ -7,11 +7,5 @@ services:
       - "18080:8080"
       - "18787:8787"
     restart: always
-    depends_on:
-      - postgresqldb
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresqldb:5432/appdb
-      - SPRING_DATASOURCE_USERNAME=appuser
-      - SPRING_DATASOURCE_PASSWORD=secret
diff --git a/httpClients/boot-web-client-mvc/docker/docker-compose.yml b/httpClients/boot-web-client-mvc/docker/docker-compose.yml
diff --git a/httpClients/boot-web-client-webflux/docker/docker-compose-app.yml b/httpClients/boot-web-client-webflux/docker/docker-compose-app.yml
@@ -7,11 +7,5 @@ services:
       - "18080:8080"
       - "18787:8787"
     restart: always
-    depends_on:
-      - postgresqldb
     environment:
       - SPRING_PROFILES_ACTIVE=docker
-      - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.postgresql.Driver
-      - SPRING_DATASOURCE_URL=jdbc:postgresql://postgresqldb:5432/appdb
-      - SPRING_DATASOURCE_USERNAME=appuser
-      - SPRING_DATASOURCE_PASSWORD=secret
diff --git a/httpClients/boot-web-client-webflux/docker/docker-compose.yml b/httpClients/boot-web-client-webflux/docker/docker-compose.yml