root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sam Brannen 2023-06-13 16:27:20 +02:00
parent 9536dd14ef 6cfb11a360
commit a268203832
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework-platform/framework-platform.gradle
View File

@ -8,7 +8,7 @@ javaPlatform {
dependencies { dependencies {
api(platform("com.fasterxml.jackson:jackson-bom:2.14.3")) 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:netty-bom:4.1.93.Final"))
api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
api(platform("io.projectreactor:reactor-bom:2022.0.7")) api(platform("io.projectreactor:reactor-bom:2022.0.7"))
@ -46,7 +46,7 @@ dependencies {
api("commons-io:commons-io:2.11.0") api("commons-io:commons-io:2.11.0")
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2") api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
api("info.picocli:picocli:4.7.4") 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.mockk:mockk:1.13.4")
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
api("io.projectreactor.tools:blockhound:1.0.8.RELEASE") api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")

1
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ReactiveTypeHandler.java
View File

@ -546,6 +546,7 @@ class ReactiveTypeHandler {
private static class ContextSnapshotHelper { private static class ContextSnapshotHelper {
@SuppressWarnings("deprecation")
public static Object writeReactorContext(Object returnValue) { public static Object writeReactorContext(Object returnValue) {
if (Mono.class.isAssignableFrom(returnValue.getClass())) { if (Mono.class.isAssignableFrom(returnValue.getClass())) {
ContextSnapshot snapshot = ContextSnapshot.captureAll(); ContextSnapshot snapshot = ContextSnapshot.captureAll();