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-docs/build.gradle
+++ b/spring-boot-project/spring-boot-docs/build.gradle
@@ -103,6 +103,7 @@ 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"))