Merge branch '2.4.x'

Closes gh-25077
2021-02-01 16:08:57 -08:00
parent c73e3cc2dc 257608a3a3
commit d8b6960997
103 changed files with 204 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 {