Merge branch '3.3.x'

Closes spring-projectsgh-42714

Author: wilkinsona

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/spring-boot-launch-script-tests-app/build.gradle

@@ -3,8 +3,6 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -17,6 +15,7 @@ repositories {
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.apache.tomcat.embed:tomcat-embed-core")
 }
 

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/spring-boot-loader-classic-tests-app/build.gradle

@@ -3,8 +3,6 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -17,6 +15,7 @@ repositories {
 }
 
 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")
 }

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-app/build.gradle

@@ -3,8 +3,6 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -17,6 +15,7 @@ repositories {
 }
 
 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")
 }

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle

@@ -5,8 +5,6 @@ plugins {
 	id "org.springframework.boot"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -19,6 +17,7 @@ repositories {
 }
 
 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")
 }

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"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -55,6 +53,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))

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"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -18,5 +16,6 @@ repositories {
 }
 
 dependencies {
+	implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 	implementation("org.springframework.boot:spring-boot-starter-web")
 }

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"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -37,6 +35,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")
 

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"
 }
 
-apply plugin: "io.spring.dependency-management"
-
 java {
 	sourceCompatibility = '17'
 	targetCompatibility = '17'
@@ -33,6 +31,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'
 	}