Merge branch '2.5.x'

Closes gh-28662
This commit is contained in:
Andy Wilkinson
2021-11-12 23:40:35 +00:00
43 changed files with 470 additions and 147 deletions

View File

@@ -25,7 +25,9 @@ dependencies {
systemTestImplementation(enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent")))
systemTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
systemTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
systemTestImplementation("org.apache.httpcomponents:httpasyncclient")
systemTestImplementation("org.apache.httpcomponents:httpasyncclient") {
exclude group: "commons-logging", module: "commons-logging"
}
systemTestImplementation("org.awaitility:awaitility")
systemTestImplementation("org.testcontainers:junit-jupiter")
systemTestImplementation("org.testcontainers:testcontainers")