From 3ae20b44bf732e440686107028a6249e603949bf Mon Sep 17 00:00:00 2001 From: Mingyuan Wu Date: Thu, 5 Dec 2024 02:07:13 +0800 Subject: [PATCH] Upgrade to Jetty 12.1 --- framework-platform/framework-platform.gradle | 4 ++-- spring-web/spring-web.gradle | 6 +++--- .../support/WebRequestDataBinderIntegrationTests.java | 4 ++-- .../http/server/reactive/bootstrap/JettyHttpServer.java | 6 +++--- spring-webflux/spring-webflux.gradle | 2 +- .../socket/server/support/HandshakeWebSocketService.java | 2 +- .../server/upgrade/JettyCoreRequestUpgradeStrategy.java | 2 +- .../server/upgrade/JettyRequestUpgradeStrategy.java | 6 +++--- spring-webmvc/spring-webmvc.gradle | 2 +- .../method/annotation/RequestPartIntegrationTests.java | 4 ++-- spring-websocket/spring-websocket.gradle | 2 +- .../socket/server/jetty/JettyRequestUpgradeStrategy.java | 6 +++--- .../socket/server/support/DefaultHandshakeHandler.java | 2 +- .../server/support/HandshakeHandlerRuntimeHints.java | 2 +- .../web/socket/JettyWebSocketTestServer.java | 8 ++++---- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 4c5779824bd..97ee16c0fa6 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -16,8 +16,8 @@ dependencies { api(platform("org.apache.groovy:groovy-bom:4.0.24")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) api(platform("org.assertj:assertj-bom:3.26.3")) - api(platform("org.eclipse.jetty:jetty-bom:12.0.15")) - api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15")) + api(platform("org.eclipse.jetty:jetty-bom:12.1.0.alpha0")) + api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.alpha0")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3")) api(platform("org.junit:junit-bom:5.11.3")) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index b107f41a0bf..8d2cae8ac1a 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -48,7 +48,7 @@ dependencies { optional("org.eclipse.jetty:jetty-server") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } - optional("org.eclipse.jetty.ee10:jetty-ee10-servlet") { + optional("org.eclipse.jetty.ee11:jetty-ee11-servlet") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" exclude group: "org.eclipse.jetty", module: "jetty-ee" exclude group: "org.eclipse.jetty", module: "jetty-security" @@ -70,7 +70,7 @@ dependencies { testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") { because("needed by Netty's SelfSignedCertificate on JDK 15+") } - testFixturesImplementation("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") + testFixturesImplementation("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") testFixturesImplementation("org.eclipse.jetty.websocket:jetty-websocket-jetty-server") testImplementation(project(":spring-core-test")) testImplementation(testFixtures(project(":spring-beans"))) @@ -88,7 +88,7 @@ dependencies { testImplementation("org.apache.tomcat:tomcat-util") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.eclipse.jetty:jetty-server") - testImplementation("org.eclipse.jetty.ee10:jetty-ee10-servlet") + testImplementation("org.eclipse.jetty.ee11:jetty-ee11-servlet") testImplementation("org.jetbrains.kotlin:kotlin-reflect") testImplementation("org.skyscreamer:jsonassert") testImplementation("org.xmlunit:xmlunit-assertj") diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java index 73f47d16805..3dd921ceda2 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java @@ -25,8 +25,8 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.Part; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java index eb1cc085991..da2fdc20708 100644 --- a/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java +++ b/spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java @@ -16,9 +16,9 @@ package org.springframework.web.testfixture.http.server.reactive.bootstrap; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 1ea20efabc8..f7980691c5a 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -24,7 +24,7 @@ dependencies { exclude group: "org.apache.tomcat", module: "tomcat-servlet-api" exclude group: "org.apache.tomcat", module: "tomcat-websocket-api" } - optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") { + optional("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } optional("org.eclipse.jetty.websocket:jetty-websocket-jetty-server") diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java index 603d8e61834..1a3b12f0560 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java @@ -90,7 +90,7 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle { tomcatWsPresent = ClassUtils.isPresent( "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader); jettyWsPresent = ClassUtils.isPresent( - "org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader); + "org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer", classLoader); jettyCoreWsPresent = ClassUtils.isPresent( "org.eclipse.jetty.websocket.server.ServerWebSocketContainer", classLoader); undertowWsPresent = ClassUtils.isPresent( diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyCoreRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyCoreRequestUpgradeStrategy.java index 94701d3bf0d..1349d3e13f1 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyCoreRequestUpgradeStrategy.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyCoreRequestUpgradeStrategy.java @@ -19,7 +19,7 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.server.Server; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java index 46d8b709036..60d08cd9048 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java @@ -22,8 +22,8 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketCreator; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketCreator; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; import org.eclipse.jetty.websocket.api.Configurable; import reactor.core.publisher.Mono; @@ -42,7 +42,7 @@ import org.springframework.web.server.ServerWebExchange; /** - * A WebSocket {@code RequestUpgradeStrategy} for Jetty 12 EE10. + * A WebSocket {@code RequestUpgradeStrategy} for Jetty 12 EE11. * * @author Rossen Stoyanchev * @since 5.3.4 diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 1ad94cf0776..d036ac33b46 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -56,7 +56,7 @@ dependencies { exclude group: "pull-parser", module: "pull-parser" exclude group: "xpp3", module: "xpp3" } - testImplementation("org.eclipse.jetty.ee10:jetty-ee10-servlet") { + testImplementation("org.eclipse.jetty.ee11:jetty-ee11-servlet") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } testImplementation("org.hibernate:hibernate-validator") diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java index e7925b84e19..35d8d239779 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java @@ -27,8 +27,8 @@ import java.util.Optional; import jakarta.servlet.MultipartConfigElement; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; diff --git a/spring-websocket/spring-websocket.gradle b/spring-websocket/spring-websocket.gradle index c20652bb129..27d12b292e6 100644 --- a/spring-websocket/spring-websocket.gradle +++ b/spring-websocket/spring-websocket.gradle @@ -12,7 +12,7 @@ dependencies { optional("jakarta.servlet:jakarta.servlet-api") optional("jakarta.websocket:jakarta.websocket-api") optional("jakarta.websocket:jakarta.websocket-client-api") - optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") { + optional("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } optional("org.eclipse.jetty.websocket:jetty-websocket-jetty-api") diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java index 2ed4542e311..8a7e7d6cbb9 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java @@ -26,8 +26,8 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketCreator; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketCreator; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; import org.eclipse.jetty.websocket.api.Configurable; import org.springframework.http.server.ServerHttpRequest; @@ -45,7 +45,7 @@ import org.springframework.web.socket.server.RequestUpgradeStrategy; /** - * A {@link RequestUpgradeStrategy} for Jetty 12 EE10. + * A {@link RequestUpgradeStrategy} for Jetty 12 EE11. * * @author Rossen Stoyanchev * @since 5.3.4 diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java index cc6d3cb95e3..70977d7b3ff 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java @@ -37,7 +37,7 @@ public class DefaultHandshakeHandler extends AbstractHandshakeHandler implements ServletContextAware { private static final boolean jettyWsPresent = ClassUtils.isPresent( - "org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", + "org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer", DefaultHandshakeHandler.class.getClassLoader()); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java index 46a513377f7..50fa400cbc4 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/HandshakeHandlerRuntimeHints.java @@ -50,7 +50,7 @@ class HandshakeHandlerRuntimeHints implements RuntimeHintsRegistrar { tomcatWsPresent = ClassUtils.isPresent( "org.apache.tomcat.websocket.server.WsHttpUpgradeHandler", classLoader); jettyWsPresent = ClassUtils.isPresent( - "org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader); + "org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer", classLoader); undertowWsPresent = ClassUtils.isPresent( "io.undertow.websockets.jsr.ServerWebSocketContainer", classLoader); glassfishWsPresent = ClassUtils.isPresent( diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java index a894b2a8dfa..18a60c761df 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java @@ -21,10 +21,10 @@ import jakarta.servlet.DispatcherType; import jakarta.servlet.Filter; import jakarta.servlet.ServletContext; -import org.eclipse.jetty.ee10.servlet.FilterHolder; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee11.servlet.FilterHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server;