Merge branch '2.3.x' into 2.4.x

Closes gh-25076

spring-boot-project/spring-boot-cli/build.gradle

@@ -66,6 +66,8 @@ dependencies {
 	testImplementation("org.mockito:mockito-junit-jupiter")
 	testImplementation("org.springframework:spring-test")
 
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
 	testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator", configuration: "mavenRepository"))
 	testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-amqp", configuration: "mavenRepository"))
 	testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-aop", configuration: "mavenRepository"))

spring-boot-project/spring-boot-docs/build.gradle

@@ -103,6 +103,7 @@ dependencies {
 
 	testRuntimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 	testRuntimeOnly("com.h2database:h2")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.springframework:spring-jdbc")
 
 	testSlices(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "testSliceMetadata"))

spring-boot-project/spring-boot-properties-migrator/build.gradle

@@ -14,4 +14,6 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.springframework:spring-test")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

@@ -24,6 +24,8 @@ dependencies {
 
 	implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
 	implementation("org.springframework:spring-core")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 task copyIntegrationTestSources(type: Copy) {

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/build.gradle

@@ -13,4 +13,6 @@ dependencies {
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.springframework:spring-core")
 	testImplementation("org.junit.jupiter:junit-jupiter")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

@@ -13,7 +13,7 @@ dependencies {
 	api("org.apache.commons:commons-compress:1.19")
 	api("org.apache.httpcomponents:httpclient")
 	api("org.springframework:spring-core")
-	
+
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation("com.jayway.jsonpath:json-path")
 	testImplementation("org.assertj:assertj-core")
@@ -23,4 +23,6 @@ dependencies {
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.mockito:mockito-junit-jupiter")
 	testImplementation("org.skyscreamer:jsonassert")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle

@@ -14,4 +14,6 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.springframework:spring-core")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/build.gradle

@@ -26,4 +26,6 @@ dependencies {
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.projectlombok:lombok")
 	testImplementation("org.springframework:spring-core")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/build.gradle

@@ -14,4 +14,6 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.mockito:mockito-junit-jupiter")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

@@ -31,6 +31,8 @@ dependencies {
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.zeroturnaround:zt-zip:1.13")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 sourceSets {

spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle

@@ -18,6 +18,7 @@ dependencies {
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
 	testRuntimeOnly("org.bouncycastle:bcprov-jdk16:1.46")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.slf4j:jcl-over-slf4j")
 	testRuntimeOnly("org.springframework:spring-webmvc")
-}
+}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@@ -39,6 +39,8 @@ dependencies {
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.mockito:mockito-junit-jupiter")
 	testImplementation("org.springframework:spring-core")
+
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 syncDocumentationSourceForAsciidoctor {