diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3313264b..74957a14 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,4 +13,5 @@ dependencies { implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3") implementation("de.thetaphi:forbiddenapis:3.8") implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.0") + implementation("org.gradle:test-retry-gradle-plugin:1.6.1") } diff --git a/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts index 2b6a69ad..ee33c9d9 100644 --- a/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts @@ -18,6 +18,7 @@ plugins { id("com.github.spotbugs") id("net.ltgt.errorprone") id("com.google.osdetector") + id("org.gradle.test-retry") } dependencies { @@ -95,6 +96,12 @@ tasks { dependsOn(checkstyleMain, checkstyleTest, pmdMain, pmdTest, spotbugsMain, spotbugsTest) finalizedBy(jacocoTestReport, jacocoTestCoverageVerification) maxParallelForks = 1 + + retry { + maxRetries.set(1) + maxFailures.set(3) + failOnPassedAfterRetry.set(false) + } } jacocoTestCoverageVerification { diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml index fa15936f..54b83035 100644 --- a/docker/docker-compose-base.yml +++ b/docker/docker-compose-base.yml @@ -86,7 +86,7 @@ services: postgres: container_name: postgres - image: postgres:17.0 + image: postgres:17.2 shm_size: "2gb" environment: POSTGRES_DB: "otel_demo_db" diff --git a/spring-boot-2-demo-app/src/main/resources/application.yml b/spring-boot-2-demo-app/src/main/resources/application.yml index c1c01724..27d784f2 100644 --- a/spring-boot-2-demo-app/src/main/resources/application.yml +++ b/spring-boot-2-demo-app/src/main/resources/application.yml @@ -1,6 +1,7 @@ app: external-base-url: "http://worldtimeapi.org/api/timezone/" retries: 3 + tenant.name: ru-a1-private server: port: 8090 diff --git a/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java b/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java index d32f7b4a..7480aeca 100644 --- a/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/IndexesMaintenanceTest.java +++ b/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.0"); + .startsWith("PostgreSQL 17.2"); } @Test diff --git a/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/support/PostgresInitializer.java b/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/support/PostgresInitializer.java index 53caa1b5..d162241e 100644 --- a/spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/support/PostgresInitializer.java +++ b/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 { - private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.0"); + private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.2"); private static final Network NETWORK = Network.newNetwork(); private static final PostgreSQLContainer CONTAINER = new PostgreSQLContainer<>(IMAGE); diff --git a/spring-boot-3-demo-app/src/main/resources/application.yml b/spring-boot-3-demo-app/src/main/resources/application.yml index 568ff4dd..47ec6d64 100644 --- a/spring-boot-3-demo-app/src/main/resources/application.yml +++ b/spring-boot-3-demo-app/src/main/resources/application.yml @@ -1,6 +1,7 @@ app: external-base-url: "http://worldtimeapi.org/api/timezone/" retries: 3 + tenant.name: ru-a1-private server: port: 8080 diff --git a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java index 1316e4e6..99604469 100644 --- a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/IndexesMaintenanceTest.java +++ b/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.0"); + .startsWith("PostgreSQL 17.2"); } @Test diff --git a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/support/PostgresInitializer.java b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/support/PostgresInitializer.java index eecf2f0a..164b3442 100644 --- a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/support/PostgresInitializer.java +++ b/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 { - private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.0"); + private static final DockerImageName IMAGE = DockerImageName.parse("postgres:17.2"); private static final Network NETWORK = Network.newNetwork(); private static final PostgreSQLContainer CONTAINER = new PostgreSQLContainer<>(IMAGE);