Skip to content

Commit 3f3341b

Browse files
committed
Drop server-specific RequestUpgradeStrategy implementations
StandardWebSocketUpgradeStrategy is the common replacement on Tomcat, Undertow and all EE servers. JettyRequestUpgradeStrategy remains the preferred choice on Jetty. Closes gh-33744
1 parent 3423693 commit 3f3341b

19 files changed

+130
-1085
lines changed

framework-platform/framework-platform.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ dependencies {
123123
api("org.freemarker:freemarker:2.3.33")
124124
api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea")
125125
api("org.glassfish:jakarta.el:4.0.2")
126-
api("org.glassfish.tyrus:tyrus-container-servlet:2.1.3")
127126
api("org.graalvm.sdk:graal-sdk:22.3.1")
128127
api("org.hamcrest:hamcrest:2.2")
129128
api("org.hibernate:hibernate-core:7.0.0.Beta2")

spring-websocket/spring-websocket.gradle

+2-10
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,11 @@ 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.apache.tomcat:tomcat-websocket") {
16-
exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
17-
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
18-
}
19-
optional("org.eclipse.jetty.ee10:jetty-ee10-webapp") {
20-
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
21-
}
22-
optional("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
23-
optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server")
2415
optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") {
2516
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
2617
}
27-
optional("org.glassfish.tyrus:tyrus-container-servlet")
18+
optional("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
19+
optional("org.eclipse.jetty:jetty-client")
2820
testImplementation(testFixtures(project(":spring-core")))
2921
testImplementation(testFixtures(project(":spring-web")))
3022
testImplementation("io.projectreactor.netty:reactor-netty-http")

spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java

-143
This file was deleted.

0 commit comments

Comments
 (0)