Skip to content

Commit 7adc2f0

Browse files
committed
Upgrade to Tomcat 10.1.16 and Jetty 12.0.4
1 parent 33b28fe commit 7adc2f0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

framework-platform/framework-platform.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
1616
api(platform("org.apache.groovy:groovy-bom:4.0.16"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
18-
api(platform("org.eclipse.jetty:jetty-bom:12.0.3"))
18+
api(platform("org.eclipse.jetty:jetty-bom:12.0.4"))
1919
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.3"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
@@ -102,10 +102,10 @@ dependencies {
102102
api("org.apache.httpcomponents.client5:httpclient5:5.2.1")
103103
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.3")
104104
api("org.apache.poi:poi-ooxml:5.2.4")
105-
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.15")
106-
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.15")
107-
api("org.apache.tomcat:tomcat-util:10.1.15")
108-
api("org.apache.tomcat:tomcat-websocket:10.1.15")
105+
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.16")
106+
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.16")
107+
api("org.apache.tomcat:tomcat-util:10.1.16")
108+
api("org.apache.tomcat:tomcat-websocket:10.1.16")
109109
api("org.aspectj:aspectjrt:1.9.20.1")
110110
api("org.aspectj:aspectjtools:1.9.20.1")
111111
api("org.aspectj:aspectjweaver:1.9.20.1")

spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHeadersAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2022 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -159,6 +159,7 @@ public void putAll(Map<? extends String, ? extends List<String>> map) {
159159
map.forEach(this::put);
160160
}
161161

162+
@SuppressWarnings("deprecation") // on Tomcat 10.1.16+
162163
@Override
163164
public void clear() {
164165
this.headers.clear();

0 commit comments

Comments
 (0)