Skip to content

Commit f2a18e5

Browse files
bclozelbclozel
committed
Upgrade to Jetty 12.1.0.alpha0
Closes gh-34237
1 parent 2561a60 commit f2a18e5

File tree

14 files changed

+28
-28
lines changed

14 files changed

+28
-28
lines changed

‎framework-platform/framework-platform.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dependencies {
1616
api(platform("org.apache.groovy:groovy-bom:4.0.24"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
1818
api(platform("org.assertj:assertj-bom:3.27.2"))
19-
api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
20-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
19+
api(platform("org.eclipse.jetty:jetty-bom:12.1.0.alpha0"))
20+
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.alpha1"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"))
2323
api(platform("org.junit:junit-bom:5.11.4"))

‎spring-web/spring-web.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
optional("org.eclipse.jetty:jetty-server") {
4949
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
5050
}
51-
optional("org.eclipse.jetty.ee10:jetty-ee10-servlet") {
51+
optional("org.eclipse.jetty.ee11:jetty-ee11-servlet") {
5252
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
5353
exclude group: "org.eclipse.jetty", module: "jetty-ee"
5454
exclude group: "org.eclipse.jetty", module: "jetty-security"
@@ -70,7 +70,7 @@ dependencies {
7070
testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") {
7171
because("needed by Netty's SelfSignedCertificate on JDK 15+")
7272
}
73-
testFixturesImplementation("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server")
73+
testFixturesImplementation("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server")
7474
testFixturesImplementation("org.eclipse.jetty.websocket:jetty-websocket-jetty-server")
7575
testImplementation(project(":spring-core-test"))
7676
testImplementation(testFixtures(project(":spring-beans")))
@@ -88,7 +88,7 @@ dependencies {
8888
testImplementation("org.apache.tomcat:tomcat-util")
8989
testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
9090
testImplementation("org.eclipse.jetty:jetty-server")
91-
testImplementation("org.eclipse.jetty.ee10:jetty-ee10-servlet")
91+
testImplementation("org.eclipse.jetty.ee11:jetty-ee11-servlet")
9292
testImplementation("org.jetbrains.kotlin:kotlin-reflect")
9393
testImplementation("org.skyscreamer:jsonassert")
9494
testImplementation("org.xmlunit:xmlunit-assertj")

‎spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import jakarta.servlet.http.HttpServletRequest;
2626
import jakarta.servlet.http.HttpServletResponse;
2727
import jakarta.servlet.http.Part;
28-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
29-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
28+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
29+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
3030
import org.eclipse.jetty.server.Connector;
3131
import org.eclipse.jetty.server.NetworkConnector;
3232
import org.eclipse.jetty.server.Server;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package org.springframework.web.testfixture.http.server.reactive.bootstrap;
1818

19-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
20-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
21-
import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
19+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
20+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
21+
import org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer;
2222
import org.eclipse.jetty.server.Server;
2323
import org.eclipse.jetty.server.ServerConnector;
2424

‎spring-webflux/spring-webflux.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
2525
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
2626
}
27-
optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") {
27+
optional("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") {
2828
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
2929
}
3030
optional("org.eclipse.jetty.websocket:jetty-websocket-jetty-client")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class HandshakeWebSocketService implements WebSocketService, Lifecycle {
8585
static {
8686
ClassLoader classLoader = HandshakeWebSocketService.class.getClassLoader();
8787
jettyWsPresent = ClassUtils.isPresent(
88-
"org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer", classLoader);
88+
"org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer", classLoader);
8989
jettyCoreWsPresent = ClassUtils.isPresent(
9090
"org.eclipse.jetty.websocket.server.ServerWebSocketContainer", classLoader);
9191
undertowWsPresent = ClassUtils.isPresent(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.function.Consumer;
2020
import java.util.function.Supplier;
2121

22-
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer;
22+
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer;
2323
import org.eclipse.jetty.server.Request;
2424
import org.eclipse.jetty.server.Response;
2525
import org.eclipse.jetty.server.Server;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import jakarta.servlet.ServletContext;
2323
import jakarta.servlet.http.HttpServletRequest;
2424
import jakarta.servlet.http.HttpServletResponse;
25-
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketCreator;
26-
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer;
25+
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketCreator;
26+
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer;
2727
import org.eclipse.jetty.websocket.api.Configurable;
2828
import org.jspecify.annotations.Nullable;
2929
import reactor.core.publisher.Mono;
@@ -42,7 +42,7 @@
4242
import org.springframework.web.server.ServerWebExchange;
4343

4444
/**
45-
* A WebSocket {@code RequestUpgradeStrategy} for Jetty 12 EE10.
45+
* A WebSocket {@code RequestUpgradeStrategy} for Jetty 12 EE11.
4646
*
4747
* @author Rossen Stoyanchev
4848
* @since 5.3.4

‎spring-webmvc/spring-webmvc.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ dependencies {
5656
exclude group: "pull-parser", module: "pull-parser"
5757
exclude group: "xpp3", module: "xpp3"
5858
}
59-
testImplementation("org.eclipse.jetty.ee10:jetty-ee10-servlet") {
59+
testImplementation("org.eclipse.jetty.ee11:jetty-ee11-servlet") {
6060
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
6161
}
6262
testImplementation("org.hibernate.validator:hibernate-validator")

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import java.util.Optional;
2828

2929
import jakarta.servlet.MultipartConfigElement;
30-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
31-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
30+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
31+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
3232
import org.eclipse.jetty.server.Connector;
3333
import org.eclipse.jetty.server.NetworkConnector;
3434
import org.eclipse.jetty.server.Server;

‎spring-websocket/spring-websocket.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
optional("jakarta.servlet:jakarta.servlet-api")
1313
optional("jakarta.websocket:jakarta.websocket-api")
1414
optional("jakarta.websocket:jakarta.websocket-client-api")
15-
optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") {
15+
optional("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") {
1616
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
1717
}
1818
optional("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")

‎spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import jakarta.servlet.ServletContext;
2727
import jakarta.servlet.http.HttpServletRequest;
2828
import jakarta.servlet.http.HttpServletResponse;
29-
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketCreator;
30-
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer;
29+
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketCreator;
30+
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer;
3131
import org.eclipse.jetty.websocket.api.Configurable;
3232
import org.jspecify.annotations.Nullable;
3333

@@ -45,7 +45,7 @@
4545
import org.springframework.web.socket.server.RequestUpgradeStrategy;
4646

4747
/**
48-
* A {@link RequestUpgradeStrategy} for Jetty 12 EE10.
48+
* A {@link RequestUpgradeStrategy} for Jetty 12 EE11.
4949
*
5050
* @author Rossen Stoyanchev
5151
* @since 5.3.4

‎spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public class DefaultHandshakeHandler extends AbstractHandshakeHandler implements ServletContextAware {
3838

3939
private static final boolean jettyWsPresent = ClassUtils.isPresent(
40-
"org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer",
40+
"org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer",
4141
DefaultHandshakeHandler.class.getClassLoader());
4242

4343

‎spring-websocket/src/test/java/org/springframework/web/socket/JettyWebSocketTestServer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import jakarta.servlet.DispatcherType;
2222
import jakarta.servlet.Filter;
2323
import jakarta.servlet.ServletContext;
24-
import org.eclipse.jetty.ee10.servlet.FilterHolder;
25-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
26-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
27-
import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
24+
import org.eclipse.jetty.ee11.servlet.FilterHolder;
25+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
26+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
27+
import org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer;
2828
import org.eclipse.jetty.server.Connector;
2929
import org.eclipse.jetty.server.NetworkConnector;
3030
import org.eclipse.jetty.server.Server;

0 commit comments

Comments
 (0)