Upgrade to Jetty 12.0.8

Closes gh-40250
spring-projects · Apr 10, 2024 · 8aebcd4 · 8aebcd4
1 parent e16fd70
commit 8aebcd4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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/...c/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/...c/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();
 		}