Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Jetty 12.1.0.alpha0

Browse Source 
Closes gh-34237
This commit is contained in:
Brian Clozel
2025-01-10 18:03:10 +01:00
parent 2561a60968
commit f2a18e5920
14 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,8 @@ dependencies {
api(platform("org.apache.groovy:groovy-bom:4.0.24"))
api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
api(platform("org.assertj:assertj-bom:3.27.2"))
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.alpha1"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"))
api(platform("org.junit:junit-bom:5.11.4"))

6
spring-web/spring-web.gradle
View File

@@ -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")

4
spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java
View File

@@ -25,8 +25,8 @@ import jakarta.servlet.http.HttpServlet;
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;

6
spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java
View File

@@ -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;

2
spring-webflux/spring-webflux.gradle
View File

@@ -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-client")

2
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
View File

@@ -85,7 +85,7 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
static {
ClassLoader classLoader = HandshakeWebSocketService.class.getClassLoader();
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(

2
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyCoreRequestUpgradeStrategy.java
View File

@@ -19,7 +19,7 @@ package org.springframework.web.reactive.socket.server.upgrade;
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;

6
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
View File

@@ -22,8 +22,8 @@ import java.util.function.Supplier;
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.jspecify.annotations.Nullable;
import reactor.core.publisher.Mono;
@@ -42,7 +42,7 @@ import org.springframework.web.reactive.socket.server.RequestUpgradeStrategy;
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

2
spring-webmvc/spring-webmvc.gradle
View File

@@ -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.validator:hibernate-validator")

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
View File

@@ -27,8 +27,8 @@ import java.util.Map;
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;

2
spring-websocket/spring-websocket.gradle
View File

@@ -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")

6
spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java
View File

@@ -26,8 +26,8 @@ import java.util.function.Consumer;
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.jspecify.annotations.Nullable;
@@ -45,7 +45,7 @@ import org.springframework.web.socket.server.HandshakeFailureException;
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

2
spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java
View File

@@ -37,7 +37,7 @@ import org.springframework.web.socket.server.standard.StandardWebSocketUpgradeSt
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());

8
spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java
View File

@@ -21,10 +21,10 @@ import java.util.EnumSet;
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;