Merge branch '6.0.x'

2023-06-15 16:20:19 +02:00
parent 7681d12eb0 4565bcd757
commit 526d9eae7f
7 changed files with 7 additions and 7 deletions
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java
@@ -233,7 +233,7 @@ class ResponseBodyEmitterReturnValueHandlerTests {
 	}

 	@Test
-	@SuppressWarnings({"try","unused"})
+	@SuppressWarnings({"try","unused", "deprecation"})
 	void responseBodyFluxWithThreadLocal() throws Exception {
 		this.request.addHeader("Accept", "text/event-stream");