Merge branch '3.2.x' into 3.3.x

wilkinsona · wilkinsona · commit 4b89ba7d203b · 2024-10-16T12:15:34.000+01:00
Closes gh-42713
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle
@@ -3,15 +3,14 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../docker-test-maven-repository"}
 	mavenCentral()
 	spring.mavenRepositories()
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.apache.tomcat.embed:tomcat-embed-core")
 }
 
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle
@@ -3,15 +3,14 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../docker-test-maven-repository"}
 	mavenCentral()
 	spring.mavenRepositories()
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.webjars:jquery:3.5.0")
 }
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle
@@ -3,15 +3,14 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../docker-test-maven-repository"}
 	mavenCentral()
 	spring.mavenRepositories()
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.webjars:jquery:3.5.0")
 }
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle
@@ -5,15 +5,14 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../docker-test-maven-repository"}
 	mavenCentral()
 	spring.mavenRepositories()
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
 }
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
@@ -7,8 +7,6 @@ plugins {
 	id "war"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../test-repository"}
 	mavenCentral()
@@ -50,6 +48,7 @@ dependencies {
 	compileOnly("org.eclipse.jetty.ee10:jetty-ee10-servlet")
 	compileOnly("org.springframework:spring-web")
 
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter")
 
 	app(files(resourcesJar))
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
@@ -3,8 +3,6 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../int-test-maven-repository"}
 	mavenCentral()
@@ -13,5 +11,6 @@ repositories {
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter-web")
 }
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
@@ -5,8 +5,6 @@ plugins {
 	id "org.springframework.boot" version "3.3.0-SNAPSHOT"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../int-test-maven-repository"}
 	mavenCentral()
@@ -32,6 +30,7 @@ configurations {
 dependencies {
 	compileOnly("org.springframework:spring-webflux")
 
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
 
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
@@ -5,8 +5,6 @@ plugins {
 	id "org.springframework.boot" version "3.3.0-SNAPSHOT"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 repositories {
 	maven { url "file:${rootDir}/../int-test-maven-repository"}
 	mavenCentral()
@@ -28,6 +26,8 @@ configurations {
 
 dependencies {
 	compileOnly("jakarta.servlet:jakarta.servlet-api:6.0.0")
+
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter-web") {
 		exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
 	}

Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,14 @@ plugins {`
`3`	`3`	`id "org.springframework.boot"`
`4`	`4`	`}`
`5`	`5`
`6`		`-apply plugin: "io.spring.dependency-management"`
`7`		`-`
`8`	`6`	`repositories {`
`9`	`7`	`maven { url "file:${rootDir}/../docker-test-maven-repository"}`
`10`	`8`	`mavenCentral()`
`11`	`9`	`spring.mavenRepositories()`
`12`	`10`	`}`
`13`	`11`
`14`	`12`	`dependencies {`
	`13`	`+ implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))`
`15`	`14`	`implementation("org.apache.tomcat.embed:tomcat-embed-core")`
`16`	`15`	`}`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,14 @@ plugins {`
`5`	`5`	`id "org.springframework.boot"`
`6`	`6`	`}`
`7`	`7`
`8`		`-apply plugin: "io.spring.dependency-management"`
`9`		`-`
`10`	`8`	`repositories {`
`11`	`9`	`maven { url "file:${rootDir}/../docker-test-maven-repository"}`
`12`	`10`	`mavenCentral()`
`13`	`11`	`spring.mavenRepositories()`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`dependencies {`
	`15`	`+ implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))`
`17`	`16`	`implementation("org.springframework.boot:spring-boot-starter")`
`18`	`17`	`implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")`
`19`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@ plugins {`
`3`	`3`	`id "org.springframework.boot"`
`4`	`4`	`}`
`5`	`5`
`6`		`-apply plugin: "io.spring.dependency-management"`
`7`		`-`
`8`	`6`	`repositories {`
`9`	`7`	`maven { url "file:${rootDir}/../int-test-maven-repository"}`
`10`	`8`	`mavenCentral()`
`@@ -13,5 +11,6 @@ repositories {`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`dependencies {`
	`14`	`+ implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))`
`16`	`15`	`implementation("org.springframework.boot:spring-boot-starter-web")`
`17`	`16`	`}`