From 6cfb11a360bb72ac50596a81ddfeda6668466200 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 13 Jun 2023 16:03:48 +0200 Subject: [PATCH] Upgrade to Micrometer BOM 1.10.8 and context-propagation 1.0.3 Cloes gh-30657 --- framework-platform/framework-platform.gradle | 4 ++-- .../servlet/mvc/method/annotation/ReactiveTypeHandler.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index c4b957a84c..83eea72e20 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -8,7 +8,7 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.14.3")) - api(platform("io.micrometer:micrometer-bom:1.10.7")) + api(platform("io.micrometer:micrometer-bom:1.10.8")) api(platform("io.netty:netty-bom:4.1.93.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2022.0.7")) @@ -46,7 +46,7 @@ dependencies { api("commons-io:commons-io:2.11.0") api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2") api("info.picocli:picocli:4.7.4") - api("io.micrometer:context-propagation:1.0.0") + api("io.micrometer:context-propagation:1.0.3") api("io.mockk:mockk:1.13.4") api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") api("io.projectreactor.tools:blockhound:1.0.8.RELEASE") diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java index 902a7d2f7d..bd108233d1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java @@ -513,6 +513,7 @@ class ReactiveTypeHandler { private static class ContextSnapshotHelper { + @SuppressWarnings("deprecation") public static Object writeReactorContext(Object returnValue) { if (Mono.class.isAssignableFrom(returnValue.getClass())) { ContextSnapshot snapshot = ContextSnapshot.captureAll();