Merge branch '2.5.x'

Closes gh-28662
2021-11-12 23:40:35 +00:00
parent 3ba8184cb1 5e4a502b2d
commit 2a342ef416
43 changed files with 470 additions and 147 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
@@ -18,6 +18,5 @@ dependencies {

 	testRuntimeOnly("ch.qos.logback:logback-classic")
 	testRuntimeOnly("org.bouncycastle:bcprov-jdk16:1.46")
-	testRuntimeOnly("org.slf4j:jcl-over-slf4j")
 	testRuntimeOnly("org.springframework:spring-webmvc")
 }