From 4d648f8b5d9bcc9c02d90d3d2f5a5e0ee3609ba1 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 11 Apr 2025 16:57:57 +0200 Subject: [PATCH 1/2] Clean up warnings in Gradle build --- .../web/reactive/function/client/WebClientObservationTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java index f42efc97f35..0ae81818c42 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java @@ -53,7 +53,6 @@ import static org.mockito.Mockito.when; */ class WebClientObservationTests { - private final TestObservationRegistry observationRegistry = TestObservationRegistry.create(); private final ExchangeFunction exchangeFunction = mock(); @@ -63,6 +62,7 @@ class WebClientObservationTests { private WebClient.Builder builder; @BeforeEach + @SuppressWarnings("unchecked") void setup() { Hooks.enableAutomaticContextPropagation(); ClientResponse mockResponse = mock(); From 87e04df983cdd75dbccfa6d4c690238922f31e98 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Fri, 11 Apr 2025 16:58:23 +0200 Subject: [PATCH 2/2] Upgrade to JUnit 5.12.2 --- build.gradle | 2 +- framework-platform/framework-platform.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fd9bca394de..64084016647 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ configure([rootProject] + javaProjects) { project -> // TODO Uncomment link to JUnit 5 docs once we execute Gradle with Java 18+. // See https://github.com/spring-projects/spring-framework/issues/27497 // - // "https://junit.org/junit5/docs/5.12.1/api/", + // "https://junit.org/junit5/docs/5.12.2/api/", "https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/", //"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/", "https://r2dbc.io/spec/1.0.0.RELEASE/api/", diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index b41bf656521..a057d3beb16 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -20,7 +20,7 @@ dependencies { api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.18")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3")) - api(platform("org.junit:junit-bom:5.12.1")) + api(platform("org.junit:junit-bom:5.12.2")) api(platform("org.mockito:mockito-bom:5.17.0")) constraints {