Merge branch '6.2.x'

Author: sbrannen

build.gradle

@@ -57,17 +57,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")
 	}
 

spring-core/spring-core.gradle

@@ -90,9 +90,8 @@ dependencies {
 	optional("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 	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")

spring-web/spring-web.gradle

@@ -65,8 +65,7 @@ dependencies {
 	optional("tools.jackson.dataformat:jackson-dataformat-yaml")
 	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") {