From cdc95bb92aa18a2ce68e9efc3b858141ce2f335c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Apr 2024 17:59:32 +0100 Subject: [PATCH] Upgrade to Jetty 12.0.8 Closes gh-40300 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-starter-jetty/build.gradle | 8 ++++++-- .../web/embedded/jetty/JettyServletWebServerFactory.java | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 17a656603f2..5e65804956f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/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") { imports = [ "jetty-ee10-bom" diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle index 3050b1cd5c9..09e6cb4f19b 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle +++ b/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.eclipse.jetty.ee10:jetty-ee10-servlets") 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-jetty-server") + api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-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" + } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java index f7c34851b61..127cb3758b9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java +++ b/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 + @SuppressWarnings({ "deprecation", "removal" }) public ReadableByteChannel newReadableByteChannel() throws IOException { return this.delegate.newReadableByteChannel(); }