diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index e788e5e691b..ba38eef3ed1 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-5/apache-maven-4.0.0-rc-5-bin.zip diff --git a/pom.xml b/pom.xml index 5fc2fdbacb9..2395e8baf2f 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 11.12.1 v24.18.0 - 3.9 + [4.0.0-rc-5,) ${java.version} ${java.version} @@ -47,6 +47,9 @@ true + + + 4.1.0 2025.1.2 @@ -365,6 +368,7 @@ false true 2 + @{argLine} -Xshare:off **/*Tests.java **/*Test.java diff --git a/spring-boot-admin-build/pom.xml b/spring-boot-admin-build/pom.xml index a40ba486ca9..88df00ffb2b 100644 --- a/spring-boot-admin-build/pom.xml +++ b/spring-boot-admin-build/pom.xml @@ -30,7 +30,7 @@ de.codecentric spring-boot-admin-dependencies ${revision} - ../spring-boot-admin-dependencies + ../spring-boot-admin-dependencies/pom.xml @@ -38,14 +38,16 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot.version} + + 3.5.3 pom import org.springframework.cloud spring-cloud-dependencies - ${spring-cloud.version} + + 2025.0.0 pom import @@ -85,6 +87,26 @@ ${awaitility.version} test + + org.testcontainers + testcontainers + ${testcontainers.version} + test + + + org.testcontainers + testcontainers-junit-jupiter + ${testcontainers.version} + test + + + + + org.springframework.retry + spring-retry + 2.0.12 + + diff --git a/spring-boot-admin-client/pom.xml b/spring-boot-admin-client/pom.xml index ead3f1533f8..8e0b095d981 100644 --- a/spring-boot-admin-client/pom.xml +++ b/spring-boot-admin-client/pom.xml @@ -28,7 +28,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-docs/pom.xml b/spring-boot-admin-docs/pom.xml index ffe3af33575..0228f2ff892 100644 --- a/spring-boot-admin-docs/pom.xml +++ b/spring-boot-admin-docs/pom.xml @@ -30,7 +30,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-samples/pom.xml b/spring-boot-admin-samples/pom.xml index 1860153702f..b9784661d93 100644 --- a/spring-boot-admin-samples/pom.xml +++ b/spring-boot-admin-samples/pom.xml @@ -30,7 +30,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-server-cloud/pom.xml b/spring-boot-admin-server-cloud/pom.xml index 9aa6b12f1e4..04158764ffa 100644 --- a/spring-boot-admin-server-cloud/pom.xml +++ b/spring-boot-admin-server-cloud/pom.xml @@ -28,7 +28,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-server-ui/pom.xml b/spring-boot-admin-server-ui/pom.xml index 6c8ef950d6a..de93936b2c7 100644 --- a/spring-boot-admin-server-ui/pom.xml +++ b/spring-boot-admin-server-ui/pom.xml @@ -28,7 +28,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-server/pom.xml b/spring-boot-admin-server/pom.xml index 806c79c8e29..caf8009f182 100644 --- a/spring-boot-admin-server/pom.xml +++ b/spring-boot-admin-server/pom.xml @@ -28,7 +28,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-starter-client/pom.xml b/spring-boot-admin-starter-client/pom.xml index 38c6fdefe13..5422d470329 100644 --- a/spring-boot-admin-starter-client/pom.xml +++ b/spring-boot-admin-starter-client/pom.xml @@ -27,7 +27,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml diff --git a/spring-boot-admin-starter-server/pom.xml b/spring-boot-admin-starter-server/pom.xml index 6b9a5189830..b10fccd8bd1 100644 --- a/spring-boot-admin-starter-server/pom.xml +++ b/spring-boot-admin-starter-server/pom.xml @@ -28,7 +28,7 @@ de.codecentric spring-boot-admin-build ${revision} - ../spring-boot-admin-build + ../spring-boot-admin-build/pom.xml