Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Jetty 12.0.8

Browse Source 
Closes gh-40300
This commit is contained in:
Andy Wilkinson 2024-04-10 17:59:32 +01:00
parent 28b9f40126
commit cdc95bb92a
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -678,7 +678,7 @@ bom {
] ]
} }
} }
library("Jetty", "12.0.7") { library("Jetty", "12.0.8") {
group("org.eclipse.jetty.ee10") { group("org.eclipse.jetty.ee10") {
imports = [ imports = [
"jetty-ee10-bom" "jetty-ee10-bom"

8
spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle
View File

@ -11,6 +11,10 @@ dependencies {
api("org.apache.tomcat.embed:tomcat-embed-el") api("org.apache.tomcat.embed:tomcat-embed-el")
api("org.eclipse.jetty.ee10:jetty-ee10-servlets") api("org.eclipse.jetty.ee10:jetty-ee10-servlets")
api("org.eclipse.jetty.ee10:jetty-ee10-webapp") api("org.eclipse.jetty.ee10:jetty-ee10-webapp")
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") {
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") exclude group: "jakarta.el", module: "jakarta.el-api"
}
api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") {
exclude group: "jakarta.el", module: "jakarta.el-api"
}
} }

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

@ -683,6 +683,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
} }
@Override @Override
@SuppressWarnings({ "deprecation", "removal" })
public ReadableByteChannel newReadableByteChannel() throws IOException { public ReadableByteChannel newReadableByteChannel() throws IOException {
return this.delegate.newReadableByteChannel(); return this.delegate.newReadableByteChannel();
} }