From 8aebcd48c79761f956538b2e7ebb2546ce62f081 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 9 Apr 2024 12:53:04 +0100 Subject: [PATCH] Upgrade to Jetty 12.0.8 Closes gh-40250 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-starters/spring-boot-starter-jetty/build.gradle | 2 ++ .../boot/web/embedded/jetty/JettyServletWebServerFactory.java | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d6485db655e7..7cc1c0ed9bb8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -855,7 +855,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 543cc054e07b..6be8cf0f9cd6 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 @@ -12,9 +12,11 @@ dependencies { 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") { + exclude group: "jakarta.el", module: "jakarta.el-api" exclude group: "org.eclipse.jetty", module: "jetty-jndi" } api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") { + exclude group: "jakarta.el", module: "jakarta.el-api" exclude group: "org.eclipse.jetty", module: "jetty-jndi" } } 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 3f095a2982cf..ddfbad4b85f0 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 @@ -684,6 +684,7 @@ public InputStream newInputStream() throws IOException { } @Override + @SuppressWarnings({ "deprecation", "removal" }) public ReadableByteChannel newReadableByteChannel() throws IOException { return this.delegate.newReadableByteChannel(); }