Merge branch '2.3.x' into 2.4.x

See gh-25076

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,6 +60,9 @@
  * Checkstyle}, {@link TestFailuresPlugin Test Failures}, and {@link TestRetryPlugin Test
  * Retry} plugins are applied
  * <li>{@link Test} tasks are configured to use JUnit Platform and use a max heap of 1024M
+ * <li>A {@code testRuntimeOnly} dependency upon
+ * {@code org.junit.platform:junit-platform-launcher} is added to projects with the
+ * {@link JavaPlugin} applied
  * <li>{@link JavaCompile}, {@link Javadoc}, and {@link FormatTask} tasks are configured
  * to use UTF-8 encoding
  * <li>{@link JavaCompile} tasks are configured to use {@code -parameters} and, when
@@ -146,6 +149,8 @@ private void configureTestConventions(Project project) {
 			test.useJUnitPlatform();
 			test.setMaxHeapSize("1024M");
 		});
+		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies()
+				.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher"));
 		project.getPlugins().apply(TestRetryPlugin.class);
 		project.getTasks().withType(Test.class,
 				(test) -> project.getPlugins().withType(TestRetryPlugin.class, (testRetryPlugin) -> {

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -143,7 +143,6 @@ dependencies {
 	testImplementation("org.springframework.security:spring-security-test")
 	testImplementation("org.yaml:snakeyaml")
 
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.springframework.security:spring-security-oauth2-jose")
 	testRuntimeOnly("org.springframework.security:spring-security-oauth2-resource-server")
 	testRuntimeOnly("org.springframework.security:spring-security-saml2-service-provider")

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

@@ -89,6 +89,5 @@ dependencies {
 	testRuntimeOnly("javax.xml.bind:jaxb-api")
 	testRuntimeOnly("org.apache.tomcat.embed:tomcat-embed-el")
 	testRuntimeOnly("org.glassfish.jersey.ext:jersey-spring5")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.hsqldb:hsqldb")
 }

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

@@ -186,5 +186,4 @@ dependencies {
 	testImplementation("org.yaml:snakeyaml")
 
 	testRuntimeOnly("org.jetbrains.kotlin:kotlin-reflect")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

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

@@ -66,8 +66,6 @@ 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-devtools/build.gradle

@@ -70,7 +70,6 @@ dependencies {
 	testImplementation("org.thymeleaf:thymeleaf-spring5")
 	testImplementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
 
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.yaml:snakeyaml")
 }
 

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

@@ -103,7 +103,6 @@ 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,6 +14,4 @@ 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-test-autoconfigure/build.gradle

@@ -85,8 +85,6 @@ dependencies {
 	testImplementation("org.testcontainers:neo4j")
 	testImplementation("org.testcontainers:testcontainers")
 	testImplementation("org.thymeleaf:thymeleaf")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 configurations {

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

@@ -49,7 +49,6 @@ dependencies {
 	testImplementation("org.springframework:spring-webmvc")
 	testImplementation("org.testng:testng")
 
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 }
 

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

@@ -24,8 +24,6 @@ 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,6 +13,4 @@ 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,6 +23,4 @@ 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,6 +14,4 @@ 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,6 +26,4 @@ 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-gradle-plugin/build.gradle

@@ -43,8 +43,6 @@ dependencies {
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.testcontainers:junit-jupiter")
 	testImplementation("org.testcontainers:testcontainers")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 gradlePlugin {

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

@@ -14,6 +14,4 @@ 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,8 +31,6 @@ 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,7 +18,6 @@ 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

@@ -42,8 +42,6 @@ dependencies {
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.mockito:mockito-junit-jupiter")
 	testImplementation("org.springframework:spring-core")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 task syncSpringBootDependenciesBom(type: Sync) {

spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle

@@ -34,5 +34,4 @@ dependencies {
 	testImplementation("org.springframework:spring-context")
 
 	testRuntimeOnly("org.hibernate.validator:hibernate-validator")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

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

@@ -100,7 +100,6 @@ dependencies {
 	testImplementation("org.springframework.data:spring-data-r2dbc")
 	testImplementation("org.xerial:sqlite-jdbc")
 
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testRuntimeOnly("org.testcontainers:jdbc") {
 		exclude group: "javax.annotation", module: "javax.annotation-api"
 		exclude group: "javax.xml.bind", module: "jaxb-api"

spring-boot-tests/spring-boot-deployment-tests/build.gradle

@@ -27,8 +27,6 @@ dependencies {
 	intTestImplementation("org.springframework:spring-web")
 
 	providedRuntime(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 intTest {

spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/build.gradle

@@ -14,6 +14,4 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

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

@@ -20,8 +20,6 @@ dependencies {
 	intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	intTestImplementation("org.testcontainers:testcontainers")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 task syncMavenRepository(type: Sync) {

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

@@ -20,8 +20,6 @@ dependencies {
 	intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	intTestImplementation("org.testcontainers:junit-jupiter")
 	intTestImplementation("org.testcontainers:testcontainers")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 task syncMavenRepository(type: Sync) {

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle

@@ -34,7 +34,6 @@ dependencies {
 	testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-undertow", configuration: "mavenRepository"))
 
 	testRuntimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-logging"))
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 task prepareMavenBinaries(type: org.springframework.boot.build.mavenplugin.PrepareMavenBinaries) {

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-activemq/build.gradle

@@ -9,6 +9,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-activemq"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle

@@ -16,5 +16,4 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 
 	testRuntimeOnly("org.apache.httpcomponents:httpclient")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/build.gradle

@@ -17,6 +17,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/build.gradle

@@ -11,6 +11,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/build.gradle

@@ -12,6 +12,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle

@@ -15,7 +15,5 @@ dependencies {
 	runtimeOnly("com.h2database:h2")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
 	testRuntimeOnly("org.apache.httpcomponents:httpclient")
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-amqp/build.gradle

@@ -7,6 +7,4 @@ description = "Spring Boot AMQP smoke test"
 
 dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-amqp"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-animated-banner/build.gradle

@@ -7,6 +7,4 @@ description = "Spring Boot animated banner smoke test"
 
 dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle

@@ -37,8 +37,6 @@ dependencies {
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.springframework:spring-core")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 task syncTestRepository(type: Sync) {

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-aop/build.gradle

@@ -9,6 +9,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-aop"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-atmosphere/build.gradle

@@ -14,6 +14,4 @@ dependencies {
 	testImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 	testImplementation("org.springframework:spring-websocket")
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-batch/build.gradle

@@ -7,10 +7,8 @@ description = "Spring Boot Batch smoke test"
 
 dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-batch"))
-
+	
 	runtimeOnly("org.hsqldb:hsqldb")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-cache/build.gradle

@@ -39,8 +39,6 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
 
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-
 	if (project.hasProperty("cache")) {
 		caches[project.getProperty("cache")].each { runtimeOnly it }
 	}

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle

@@ -9,6 +9,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-couchbase"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-elasticsearch/build.gradle

@@ -9,6 +9,4 @@ dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-elasticsearch"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/build.gradle

@@ -12,6 +12,4 @@ dependencies {
 	runtimeOnly("com.h2database:h2")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle

@@ -13,6 +13,4 @@ dependencies {
 	runtimeOnly("com.h2database:h2")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/build.gradle

@@ -11,6 +11,4 @@ dependencies {
 	runtimeOnly("com.unboundid:unboundid-ldapsdk")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/build.gradle

@@ -11,6 +11,4 @@ dependencies {
 	runtimeOnly("de.flapdoodle.embed:de.flapdoodle.embed.mongo")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
-
-	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }