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")
 }