diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 8d3af346b7..e866c7a474 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,7 +15,7 @@ dependencies { api(platform("io.rsocket:rsocket-bom:1.1.3")) api(platform("org.apache.groovy:groovy-bom:4.0.16")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) - api(platform("org.eclipse.jetty:jetty-bom:12.0.3")) + api(platform("org.eclipse.jetty:jetty-bom:12.0.4")) api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.3")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0")) @@ -102,10 +102,10 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.2.1") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.3") api("org.apache.poi:poi-ooxml:5.2.4") - api("org.apache.tomcat.embed:tomcat-embed-core:10.1.15") - api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.15") - api("org.apache.tomcat:tomcat-util:10.1.15") - api("org.apache.tomcat:tomcat-websocket:10.1.15") + api("org.apache.tomcat.embed:tomcat-embed-core:10.1.16") + api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.16") + api("org.apache.tomcat:tomcat-util:10.1.16") + api("org.apache.tomcat:tomcat-websocket:10.1.16") api("org.aspectj:aspectjrt:1.9.20.1") api("org.aspectj:aspectjtools:1.9.20.1") api("org.aspectj:aspectjweaver:1.9.20.1") diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java index d24a3cc7f6..426cd5d275 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -159,6 +159,7 @@ class TomcatHeadersAdapter implements MultiValueMap { map.forEach(this::put); } + @SuppressWarnings("deprecation") // on Tomcat 10.1.16+ @Override public void clear() { this.headers.clear();