Merge branch '2.3.x' into 2.4.x

See gh-25076
This commit is contained in:
Andy Wilkinson
2021-02-02 15:12:27 +00:00
115 changed files with 9 additions and 219 deletions

View File

@@ -14,6 +14,4 @@ dependencies {
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"))
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

View File

@@ -20,8 +20,6 @@ dependencies {
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
intTestImplementation("org.testcontainers:testcontainers")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
task syncMavenRepository(type: Sync) {

View File

@@ -20,8 +20,6 @@ dependencies {
intTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
intTestImplementation("org.testcontainers:junit-jupiter")
intTestImplementation("org.testcontainers:testcontainers")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
task syncMavenRepository(type: Sync) {

View File

@@ -34,7 +34,6 @@ dependencies {
testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-undertow", configuration: "mavenRepository"))
testRuntimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-logging"))
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
task prepareMavenBinaries(type: org.springframework.boot.build.mavenplugin.PrepareMavenBinaries) {