Merge branch 'master' into issue-231

Author: m.zharinova

buildSrc/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation("io.freefair.gradle:lombok-plugin:8.13.1")
     implementation("com.bmuschko:gradle-docker-plugin:9.4.0")
     implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3")
-    implementation("de.thetaphi:forbiddenapis:3.8")
+    implementation("de.thetaphi:forbiddenapis:3.9")
     implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7")
     implementation("org.gradle:test-retry-gradle-plugin:1.6.2")
     val kotlinVersion = "2.0.21"

common-internal-bom/build.gradle.kts

@@ -17,9 +17,9 @@ javaPlatform {
 
 dependencies {
     api(platform("org.assertj:assertj-bom:3.27.3"))
-    api(platform("org.testcontainers:testcontainers-bom:1.20.6"))
-    api(platform("org.junit:junit-bom:5.12.1"))
-    api(platform("io.github.mfvanek:pg-index-health-bom:0.14.4"))
+    api(platform("org.testcontainers:testcontainers-bom:1.21.0"))
+    api(platform("org.junit:junit-bom:5.12.2"))
+    api(platform("io.github.mfvanek:pg-index-health-bom:0.14.6"))
 
     constraints {
         api("org.liquibase:liquibase-core:4.31.1")

docker/docker-compose-base.yml

@@ -86,7 +86,7 @@ services:
 
     postgres:
         container_name: postgres
-        image: postgres:17.2
+        image: postgres:17.4
         shm_size: "2gb"
         environment:
             POSTGRES_DB: "otel_demo_db"

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java

@@ -31,7 +31,7 @@ class IndexesMaintenanceTest extends TestBase {
     void checkPostgresVersion() {
         final String pgVersion = jdbcTemplate.queryForObject("select version();", String.class);
         assertThat(pgVersion)
-            .startsWith("PostgreSQL 17.2");
+            .startsWith("PostgreSQL 17.4");
     }
 
     @Test

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/support/PostgresInitializer.java

@@ -17,7 +17,7 @@
 
 public class PostgresInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.2");
+    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.4");
     private static final Network NETWORK = Network.newNetwork();
     private static final PostgreSQLContainer<?> CONTAINER = new PostgreSQLContainer<>(IMAGE);
 

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java

@@ -31,7 +31,7 @@ class IndexesMaintenanceTest extends TestBase {
     void checkPostgresVersion() {
         final String pgVersion = jdbcTemplate.queryForObject("select version();", String.class);
         assertThat(pgVersion)
-            .startsWith("PostgreSQL 17.2");
+            .startsWith("PostgreSQL 17.4");
     }
 
     @Test

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/support/PostgresInitializer.java

@@ -17,7 +17,7 @@
 
 public class PostgresInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.2");
+    private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.4");
     private static final Network NETWORK = Network.newNetwork();
     private static final PostgreSQLContainer<?> CONTAINER = new PostgreSQLContainer<>(IMAGE);