Merge branch '3.4.x' into 3.5.x

snicoll · snicoll · commit 59fb6bce1e11 · 2025-07-17T10:33:27.000+02:00
Closes gh-46448
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-client-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-client-app/build.gradle
@@ -27,8 +27,7 @@ java {
 repositories {
 	maven { url "file:${rootDir}/../int-test-maven-repository"}
 	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
+	spring.mavenRepositories()
 }
 
 dependencies {
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-client-app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-client-app/settings.gradle
@@ -15,11 +15,11 @@
  */
 
 pluginManagement {
+	evaluate(new File("${gradle.parent.rootProject.rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this)
 	repositories {
 		maven { url "file:${rootDir}/../int-test-maven-repository"}
 		mavenCentral()
-		maven { url "https://repo.spring.io/snapshot" }
-		maven { url "https://repo.spring.io/milestone" }
+		spring.mavenRepositories()
 	}
 	resolutionStrategy {
 		eachPlugin {
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-reactive-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-reactive-app/build.gradle
@@ -29,8 +29,7 @@ java {
 repositories {
 	maven { url "file:${rootDir}/../int-test-maven-repository"}
 	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
+	spring.mavenRepositories()
 }
 
 configurations {
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-reactive-app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-reactive-app/settings.gradle
@@ -15,11 +15,11 @@
  */
 
 pluginManagement {
+	evaluate(new File("${gradle.parent.rootProject.rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this)
 	repositories {
 		maven { url "file:${rootDir}/../int-test-maven-repository"}
 		mavenCentral()
-		maven { url "https://repo.spring.io/snapshot" }
-		maven { url "https://repo.spring.io/milestone" }
+		spring.mavenRepositories()
 	}
 	resolutionStrategy {
 		eachPlugin {
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-servlet-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-servlet-app/build.gradle
@@ -29,8 +29,7 @@ java {
 repositories {
 	maven { url "file:${rootDir}/../int-test-maven-repository"}
 	mavenCentral()
-	maven { url "https://repo.spring.io/snapshot" }
-	maven { url "https://repo.spring.io/milestone" }
+	spring.mavenRepositories()
 }
 
 configurations {
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-servlet-app/settings.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/spring-boot-sni-servlet-app/settings.gradle
@@ -15,11 +15,11 @@
  */
 
 pluginManagement {
+	evaluate(new File("${gradle.parent.rootProject.rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this)
 	repositories {
 		maven { url "file:${rootDir}/../int-test-maven-repository"}
 		mavenCentral()
-		maven { url "https://repo.spring.io/snapshot" }
-		maven { url "https://repo.spring.io/milestone" }
+		spring.mavenRepositories()
 	}
 	resolutionStrategy {
 		eachPlugin {

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ java {`
`27`	`27`	`repositories {`
`28`	`28`	`maven { url "file:${rootDir}/../int-test-maven-repository"}`
`29`	`29`	`mavenCentral()`
`30`		`- maven { url "https://repo.spring.io/snapshot" }`
`31`		`- maven { url "https://repo.spring.io/milestone" }`
	`30`	`+ spring.mavenRepositories()`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ java {`
`29`	`29`	`repositories {`
`30`	`30`	`maven { url "file:${rootDir}/../int-test-maven-repository"}`
`31`	`31`	`mavenCentral()`
`32`		`- maven { url "https://repo.spring.io/snapshot" }`
`33`		`- maven { url "https://repo.spring.io/milestone" }`
	`32`	`+ spring.mavenRepositories()`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`configurations {`