Browse Source

Upgrade to Jetty 12.0.8

Closes gh-40300
pull/40554/head
Andy Wilkinson 2 years ago
parent
commit
cdc95bb92a
  1. 2
      spring-boot-project/spring-boot-dependencies/build.gradle
  2. 8
      spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle
  3. 1
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java

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

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

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

@ -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();
} }

Loading…
Cancel
Save