Merge branch '2.3.x' into 2.4.x

See gh-25076
2021-02-02 15:12:27 +00:00
parent 230b4ab2eb 67479b6380
commit 788a42d694
115 changed files with 9 additions and 219 deletions
--- a/spring-boot-project/spring-boot-test/build.gradle
+++ b/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")
 }