Skip to content

Commit 1ad05db

Browse files
committed
Simplify dependency management for JUnit artifacts
This commit simplifies our dependency management for JUnit artifacts by making use of the junit-jupiter and junit-platform-suite aggregator artifacts. Closes gh-35127
1 parent bd72f1f commit 1ad05db

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,13 @@ configure([rootProject] + javaProjects) { project ->
6868
apply from: "${rootDir}/gradle/ide.gradle"
6969

7070
dependencies {
71-
testImplementation("org.junit.jupiter:junit-jupiter-api")
72-
testImplementation("org.junit.jupiter:junit-jupiter-params")
73-
testImplementation("org.junit.platform:junit-platform-suite-api")
71+
testImplementation("org.junit.jupiter:junit-jupiter")
72+
testImplementation("org.junit.platform:junit-platform-suite")
7473
testImplementation("org.mockito:mockito-core")
7574
testImplementation("org.mockito:mockito-junit-jupiter")
7675
testImplementation("io.mockk:mockk")
7776
testImplementation("org.assertj:assertj-core")
78-
// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
79-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
8077
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
81-
testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
8278
testRuntimeOnly("org.apache.logging.log4j:log4j-core")
8379
testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
8480
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl")

spring-core/spring-core.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@ dependencies {
8989
testFixturesImplementation("com.google.code.findbugs:jsr305")
9090
testFixturesImplementation("io.projectreactor:reactor-test")
9191
testFixturesImplementation("org.assertj:assertj-core")
92+
testFixturesImplementation("org.junit.jupiter:junit-jupiter")
9293
testFixturesImplementation("org.junit.platform:junit-platform-launcher")
93-
testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
94-
testFixturesImplementation("org.junit.jupiter:junit-jupiter-params")
9594
testFixturesImplementation("org.xmlunit:xmlunit-assertj")
9695
testImplementation("com.fasterxml.jackson.core:jackson-databind")
9796
testImplementation("com.fasterxml.woodstox:woodstox-core")

spring-web/spring-web.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ dependencies {
6464
optional("org.jetbrains.kotlinx:kotlinx-serialization-protobuf")
6565
optional("com.fasterxml:aalto-xml") // out of order to avoid XML parser override
6666
testFixturesApi("jakarta.servlet:jakarta.servlet-api")
67-
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
68-
testFixturesApi("org.junit.jupiter:junit-jupiter-params")
67+
testFixturesApi("org.junit.jupiter:junit-jupiter")
6968
testFixturesImplementation("io.projectreactor:reactor-test")
7069
testFixturesImplementation("org.assertj:assertj-core")
7170
testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") {

0 commit comments

Comments
 (0)