diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 44f3cf2c184..21c81a2a468 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.11/apache-maven-3.9.11-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-4/apache-maven-4.0.0-rc-4-bin.zip diff --git a/pom.xml b/pom.xml index 1a414958c9d..e6355dd7ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 17 v22.12.0 - 3.9 + [4.0.0-rc-4,) ${java.version} ${java.version} @@ -43,6 +43,9 @@ UTF-8 UTF-8 + + + 3.5.5 2025.0.0 @@ -359,6 +362,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 f3393f4d2d2..0c3321ebfeb 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 @@ -97,6 +99,14 @@ ${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 1a5334c620f..c407420ddaf 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 79e51578823..ef549fb6f10 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 a2beab77024..e6fbfabe7cb 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 c50be933cdf..6b206529a1f 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 5b2a1771faa..c9087177b3a 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