Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x

Browse Source 
See gh-25076
This commit is contained in:
Andy Wilkinson
2021-02-02 15:12:27 +00:00
parent 230b4ab2eb 67479b6380
commit 788a42d694
115 changed files with 9 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle
View File

@@ -24,8 +24,6 @@ dependencies {
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("org.springframework:spring-core")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
task copyIntegrationTestSources(type: Copy) {

2
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/build.gradle
View File

@@ -13,6 +13,4 @@ dependencies {
testImplementation("org.assertj:assertj-core")
testImplementation("org.springframework:spring-core")
testImplementation("org.junit.jupiter:junit-jupiter")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle
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,6 +23,4 @@ dependencies {
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation("org.skyscreamer:jsonassert")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle
View File

@@ -14,6 +14,4 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.assertj:assertj-core")
testImplementation("org.springframework:spring-core")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/build.gradle
View File

@@ -26,6 +26,4 @@ dependencies {
testImplementation("org.mockito:mockito-core")
testImplementation("org.projectlombok:lombok")
testImplementation("org.springframework:spring-core")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@@ -43,8 +43,6 @@ dependencies {
testImplementation("org.mockito:mockito-core")
testImplementation("org.testcontainers:junit-jupiter")
testImplementation("org.testcontainers:testcontainers")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
gradlePlugin {

2
spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/build.gradle
View File

@@ -14,6 +14,4 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
View File

@@ -31,8 +31,6 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-core")
testImplementation("org.zeroturnaround:zt-zip:1.13")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
sourceSets {

3
spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
View File

@@ -18,7 +18,6 @@ dependencies {
testRuntimeOnly("ch.qos.logback:logback-classic")
testRuntimeOnly("org.bouncycastle:bcprov-jdk16:1.46")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.slf4j:jcl-over-slf4j")
testRuntimeOnly("org.springframework:spring-webmvc")
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
View File

@@ -42,8 +42,6 @@ dependencies {
testImplementation("org.mockito:mockito-core")
testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation("org.springframework:spring-core")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
task syncSpringBootDependenciesBom(type: Sync) {

1
spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
View File

@@ -34,5 +34,4 @@ dependencies {
testImplementation("org.springframework:spring-context")
testRuntimeOnly("org.hibernate.validator:hibernate-validator")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}