diff --git a/build.gradle b/build.gradle index 0a182af39a..14e51cde82 100644 --- a/build.gradle +++ b/build.gradle @@ -68,17 +68,13 @@ configure([rootProject] + javaProjects) { project -> apply from: "${rootDir}/gradle/ide.gradle" dependencies { - testImplementation("org.junit.jupiter:junit-jupiter-api") - testImplementation("org.junit.jupiter:junit-jupiter-params") - testImplementation("org.junit.platform:junit-platform-suite-api") + testImplementation("org.junit.jupiter:junit-jupiter") + testImplementation("org.junit.platform:junit-platform-suite") testImplementation("org.mockito:mockito-core") testImplementation("org.mockito:mockito-junit-jupiter") testImplementation("io.mockk:mockk") testImplementation("org.assertj:assertj-core") - // Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs. - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.platform:junit-platform-launcher") - testRuntimeOnly("org.junit.platform:junit-platform-suite-engine") testRuntimeOnly("org.apache.logging.log4j:log4j-core") testRuntimeOnly("org.apache.logging.log4j:log4j-jul") testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl") diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index a76fbe2904..4efdde03f0 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -89,9 +89,8 @@ dependencies { testFixturesImplementation("com.google.code.findbugs:jsr305") testFixturesImplementation("io.projectreactor:reactor-test") testFixturesImplementation("org.assertj:assertj-core") + testFixturesImplementation("org.junit.jupiter:junit-jupiter") testFixturesImplementation("org.junit.platform:junit-platform-launcher") - testFixturesImplementation("org.junit.jupiter:junit-jupiter-api") - testFixturesImplementation("org.junit.jupiter:junit-jupiter-params") testFixturesImplementation("org.xmlunit:xmlunit-assertj") testImplementation("com.fasterxml.jackson.core:jackson-databind") testImplementation("com.fasterxml.woodstox:woodstox-core") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 7585e176b9..2311b42aa9 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -64,8 +64,7 @@ dependencies { optional("org.jetbrains.kotlinx:kotlinx-serialization-protobuf") optional("com.fasterxml:aalto-xml") // out of order to avoid XML parser override testFixturesApi("jakarta.servlet:jakarta.servlet-api") - testFixturesApi("org.junit.jupiter:junit-jupiter-api") - testFixturesApi("org.junit.jupiter:junit-jupiter-params") + testFixturesApi("org.junit.jupiter:junit-jupiter") testFixturesImplementation("io.projectreactor:reactor-test") testFixturesImplementation("org.assertj:assertj-core") testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") {