Merge branch '2.3.x' into 2.4.x

Closes gh-25076
2021-02-01 16:03:43 -08:00
parent 79c0597aa2 939b5dfc26
commit 257608a3a3
105 changed files with 208 additions and 3 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
+++ b/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 {