Skip to content

Commit cdc95bb

Browse files
committed
Upgrade to Jetty 12.0.8
Closes gh-40300
1 parent 28b9f40 commit cdc95bb

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ bom {
678678
]
679679
}
680680
}
681-
library("Jetty", "12.0.7") {
681+
library("Jetty", "12.0.8") {
682682
group("org.eclipse.jetty.ee10") {
683683
imports = [
684684
"jetty-ee10-bom"

spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ dependencies {
1111
api("org.apache.tomcat.embed:tomcat-embed-el")
1212
api("org.eclipse.jetty.ee10:jetty-ee10-servlets")
1313
api("org.eclipse.jetty.ee10:jetty-ee10-webapp")
14-
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server")
15-
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server")
14+
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") {
15+
exclude group: "jakarta.el", module: "jakarta.el-api"
16+
}
17+
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") {
18+
exclude group: "jakarta.el", module: "jakarta.el-api"
19+
}
1620
}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java

+1
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@ public InputStream newInputStream() throws IOException {
683683
}
684684

685685
@Override
686+
@SuppressWarnings({ "deprecation", "removal" })
686687
public ReadableByteChannel newReadableByteChannel() throws IOException {
687688
return this.delegate.newReadableByteChannel();
688689
}

0 commit comments

Comments
 (0)