From 3b030e0431ea3c4b5197762c466181185d357ade Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Wed, 20 May 2026 16:34:26 +0200 Subject: [PATCH] Upgrade to JUnit 6.1 Closes gh-36815 --- build.gradle | 2 +- framework-platform/framework-platform.gradle | 2 +- .../jupiter/parallel/ParallelExecutionSpringExtensionTests.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f7ff096497a..62361bb488c 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ configure([rootProject] + javaProjects) { project -> "https://projectreactor.io/docs/core/release/api/", "https://projectreactor.io/docs/test/release/api/", "https://junit.org/junit4/javadoc/4.13.2/", - "https://docs.junit.org/6.0.3/api/", + "https://docs.junit.org/6.1.0/api/", "https://www.reactive-streams.org/reactive-streams-1.0.4-javadoc/", "https://r2dbc.io/spec/1.0.0.RELEASE/api/", "https://jspecify.dev/docs/api/" diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index a051f9e5dc8..9297635fc7c 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -19,7 +19,7 @@ dependencies { api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.9")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0")) - api(platform("org.junit:junit-bom:6.0.3")) + api(platform("org.junit:junit-bom:6.1.0")) api(platform("org.mockito:mockito-bom:5.23.0")) api(platform("tools.jackson:jackson-bom:3.1.1")) diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java index 45a5945d203..9f47571940e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/parallel/ParallelExecutionSpringExtensionTests.java @@ -58,6 +58,7 @@ class ParallelExecutionSpringExtensionTests { .configurationParameter("junit.jupiter.conditions.deactivate", "org.junit.jupiter.engine.extension.DisabledCondition")// .configurationParameter("junit.jupiter.execution.parallel.enabled", "true")// .configurationParameter("junit.jupiter.execution.parallel.config.dynamic.factor", "10")// + .configurationParameter("junit.jupiter.execution.parallel.config.executor-service", "WORKER_THREAD_POOL") .selectors(selectClass(TestCase.class))// .build();