Merge branch '2.3.x' into 2.4.x

Closes gh-25076
This commit is contained in:
Phillip Webb
2021-02-01 16:03:43 -08:00
105 changed files with 208 additions and 3 deletions

View File

@@ -13,7 +13,7 @@ dependencies {
api("org.apache.commons:commons-compress:1.19")
api("org.apache.httpcomponents:httpclient")
api("org.springframework:spring-core")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation("com.jayway.jsonpath:json-path")
testImplementation("org.assertj:assertj-core")
@@ -23,4 +23,6 @@ dependencies {
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation("org.skyscreamer:jsonassert")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}