diff --git a/integration-test/spring-boot-integration-tests/build.gradle b/integration-test/spring-boot-integration-tests/build.gradle index be023bbbcbf..267621c4474 100644 --- a/integration-test/spring-boot-integration-tests/build.gradle +++ b/integration-test/spring-boot-integration-tests/build.gradle @@ -37,8 +37,8 @@ dependencies { testRuntimeOnly("ch.qos.logback:logback-classic") testRuntimeOnly("io.undertow:undertow-servlet") - testRuntimeOnly("org.eclipse.jetty.ee10:jetty-ee10-servlets") - testRuntimeOnly("org.eclipse.jetty.ee10:jetty-ee10-webapp") + testRuntimeOnly("org.eclipse.jetty.ee11:jetty-ee11-servlets") + testRuntimeOnly("org.eclipse.jetty.ee11:jetty-ee11-webapp") } test { diff --git a/module/spring-boot-devtools/build.gradle b/module/spring-boot-devtools/build.gradle index 835471fcfd7..b88cef7e3a8 100644 --- a/module/spring-boot-devtools/build.gradle +++ b/module/spring-boot-devtools/build.gradle @@ -94,7 +94,7 @@ dependencies { testImplementation("org.apache.tomcat.embed:tomcat-embed-websocket") testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper") - testImplementation("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client") + testImplementation("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-client") testImplementation("org.hsqldb:hsqldb") testImplementation("org.postgresql:postgresql") testImplementation("org.springframework:spring-webmvc") diff --git a/module/spring-boot-jetty/build.gradle b/module/spring-boot-jetty/build.gradle index b0a4db034de..fb42ffbc450 100644 --- a/module/spring-boot-jetty/build.gradle +++ b/module/spring-boot-jetty/build.gradle @@ -26,16 +26,16 @@ description = "Spring Boot Jetty" dependencies { api(project(":module:spring-boot-web-server")) - api("org.eclipse.jetty.ee10:jetty-ee10-servlets") - api("org.eclipse.jetty.ee10:jetty-ee10-webapp") + api("org.eclipse.jetty.ee11:jetty-ee11-servlets") + api("org.eclipse.jetty.ee11:jetty-ee11-webapp") optional(project(":core:spring-boot-autoconfigure")) optional(project(":module:spring-boot-actuator-autoconfigure")) optional(project(":module:spring-boot-metrics")) optional("org.apache.tomcat.embed:tomcat-embed-jasper") optional("org.eclipse.jetty:jetty-alpn-conscrypt-server") - optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") - optional("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server") + optional("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jakarta-server") + optional("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") optional("org.eclipse.jetty.http2:jetty-http2-server") optional("org.springframework:spring-webflux") diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServer.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServer.java index 515f61bbea3..8e8ff7d63b9 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServer.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServer.java @@ -24,8 +24,8 @@ import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.NetworkConnector; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServerFactory.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServerFactory.java index fd9753e6672..13c569f995d 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServerFactory.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/JettyWebServerFactory.java @@ -25,8 +25,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.Executor; -import org.eclipse.jetty.ee10.webapp.Configuration; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.Configuration; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.server.AbstractConnector; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizer.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizer.java index 9b0abed2ef1..476bece1451 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizer.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizer.java @@ -23,7 +23,7 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.stream.Stream; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Connector; @@ -93,7 +93,7 @@ public class JettyWebServerFactoryCustomizer map.from(this.jettyProperties::getMaxHttpResponseHeaderSize) .asInt(DataSize::toBytes) .when(this::isPositive) - .to(customizeHttpConfigurations(factory, HttpConfiguration::setResponseHeaderSize)); + .to(customizeHttpConfigurations(factory, HttpConfiguration::setMaxResponseHeaderSize)); map.from(this.jettyProperties::getMaxHttpFormPostSize) .asInt(DataSize::toBytes) .when(this::isPositive) diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfiguration.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfiguration.java index 8fb14ef83fe..a335f0b3ad3 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfiguration.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfiguration.java @@ -16,8 +16,8 @@ package org.springframework.boot.jetty.autoconfigure.reactive; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; import org.eclipse.jetty.server.Server; import org.springframework.beans.factory.ObjectProvider; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/WebSocketJettyReactiveWebServerFactoryCustomizer.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/WebSocketJettyReactiveWebServerFactoryCustomizer.java index 3523aaa682b..24263f069eb 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/WebSocketJettyReactiveWebServerFactoryCustomizer.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/reactive/WebSocketJettyReactiveWebServerFactoryCustomizer.java @@ -17,10 +17,10 @@ package org.springframework.boot.jetty.autoconfigure.reactive; import jakarta.servlet.ServletContext; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.websocket.jakarta.server.JakartaWebSocketServerContainer; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; -import org.eclipse.jetty.ee10.websocket.servlet.WebSocketUpgradeFilter; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.websocket.jakarta.server.JakartaWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.servlet.WebSocketUpgradeFilter; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.websocket.core.server.WebSocketMappings; import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfiguration.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfiguration.java index e7357a8efb4..ada67d68d25 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfiguration.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfiguration.java @@ -21,9 +21,9 @@ import java.util.EnumSet; import jakarta.servlet.DispatcherType; import jakarta.servlet.FilterRegistration.Dynamic; import jakarta.servlet.ServletRequest; -import org.eclipse.jetty.ee10.webapp.WebAppContext; -import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; -import org.eclipse.jetty.ee10.websocket.servlet.WebSocketUpgradeFilter; +import org.eclipse.jetty.ee11.webapp.WebAppContext; +import org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer; +import org.eclipse.jetty.ee11.websocket.servlet.WebSocketUpgradeFilter; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.Loader; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/WebSocketJettyServletWebServerFactoryCustomizer.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/WebSocketJettyServletWebServerFactoryCustomizer.java index 03d65d0d9ac..47eb55b771c 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/WebSocketJettyServletWebServerFactoryCustomizer.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/autoconfigure/servlet/WebSocketJettyServletWebServerFactoryCustomizer.java @@ -16,11 +16,11 @@ package org.springframework.boot.jetty.autoconfigure.servlet; -import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; -import org.eclipse.jetty.ee10.webapp.WebAppContext; -import org.eclipse.jetty.ee10.websocket.jakarta.server.JakartaWebSocketServerContainer; -import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer; -import org.eclipse.jetty.ee10.websocket.servlet.WebSocketUpgradeFilter; +import org.eclipse.jetty.ee11.webapp.AbstractConfiguration; +import org.eclipse.jetty.ee11.webapp.WebAppContext; +import org.eclipse.jetty.ee11.websocket.jakarta.server.JakartaWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer; +import org.eclipse.jetty.ee11.websocket.servlet.WebSocketUpgradeFilter; import org.eclipse.jetty.websocket.core.server.WebSocketMappings; import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/JettyReactiveWebServerFactory.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/JettyReactiveWebServerFactory.java index ea936b0fded..1164fc1cb28 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/JettyReactiveWebServerFactory.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/JettyReactiveWebServerFactory.java @@ -20,8 +20,8 @@ import java.net.InetSocketAddress; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; import org.eclipse.jetty.server.NetworkConnectionLimit; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.StatisticsHandler; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JasperInitializer.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JasperInitializer.java index 746b308a661..b7331ff985d 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JasperInitializer.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JasperInitializer.java @@ -24,7 +24,7 @@ import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; import jakarta.servlet.ServletContainerInitializer; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.jspecify.annotations.Nullable; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedErrorHandler.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedErrorHandler.java index b1263a98e7f..073d04200d3 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedErrorHandler.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedErrorHandler.java @@ -16,7 +16,7 @@ package org.springframework.boot.jetty.servlet; -import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.ee11.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.http.HttpMethod; /** diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedWebAppContext.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedWebAppContext.java index 862185a72f4..b61f43f015f 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedWebAppContext.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyEmbeddedWebAppContext.java @@ -16,8 +16,8 @@ package org.springframework.boot.jetty.servlet; -import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.servlet.ServletHandler; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.util.ClassMatcher; import org.springframework.boot.jetty.JettyWebServer; diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactory.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactory.java index 2197bb0888a..0242aaccdaf 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactory.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactory.java @@ -31,18 +31,18 @@ import java.util.UUID; import jakarta.servlet.http.Cookie; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.eclipse.jetty.ee10.servlet.ErrorHandler; -import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; -import org.eclipse.jetty.ee10.servlet.ListenerHolder; -import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.servlet.ServletMapping; -import org.eclipse.jetty.ee10.servlet.SessionHandler; -import org.eclipse.jetty.ee10.servlet.Source; -import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; -import org.eclipse.jetty.ee10.webapp.Configuration; -import org.eclipse.jetty.ee10.webapp.WebAppContext; -import org.eclipse.jetty.ee10.webapp.WebInfConfiguration; +import org.eclipse.jetty.ee11.servlet.ErrorHandler; +import org.eclipse.jetty.ee11.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.ee11.servlet.ListenerHolder; +import org.eclipse.jetty.ee11.servlet.ServletHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.servlet.ServletMapping; +import org.eclipse.jetty.ee11.servlet.SessionHandler; +import org.eclipse.jetty.ee11.servlet.Source; +import org.eclipse.jetty.ee11.webapp.AbstractConfiguration; +import org.eclipse.jetty.ee11.webapp.Configuration; +import org.eclipse.jetty.ee11.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.WebInfConfiguration; import org.eclipse.jetty.http.CookieCompliance; import org.eclipse.jetty.http.HttpCookie; import org.eclipse.jetty.http.HttpField; @@ -50,7 +50,6 @@ import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpFields.Mutable; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.MimeTypes; -import org.eclipse.jetty.http.MimeTypes.Wrapper; import org.eclipse.jetty.http.SetCookieParser; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; @@ -336,7 +335,7 @@ public class JettyServletWebServerFactory extends JettyWebServerFactory Assert.notNull(context, "'context' must not be null"); ServletHolder holder = new ServletHolder(); holder.setName("default"); - holder.setClassName("org.eclipse.jetty.ee10.servlet.DefaultServlet"); + holder.setClassName("org.eclipse.jetty.ee11.servlet.DefaultServlet"); holder.setInitParameter("dirAllowed", "false"); holder.setInitOrder(1); context.getServletHandler().addServletWithMapping(holder, "/"); @@ -406,8 +405,8 @@ public class JettyServletWebServerFactory extends JettyWebServerFactory @Override public void configure(WebAppContext context) throws Exception { - MimeTypes.Wrapper mimeTypes = (Wrapper) context.getMimeTypes(); - mimeTypes.setWrapped(new MimeTypes(null)); + MimeTypes.Mutable mimeTypes = context.getMimeTypes(); + mimeTypes.clear(); for (MimeMappings.Mapping mapping : getSettings().getMimeMappings()) { mimeTypes.addMimeMapping(mapping.getExtension(), mapping.getMimeType()); } diff --git a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/ServletContextInitializerConfiguration.java b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/ServletContextInitializerConfiguration.java index 2042b992eaa..f9806a7fde2 100644 --- a/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/ServletContextInitializerConfiguration.java +++ b/module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/ServletContextInitializerConfiguration.java @@ -17,9 +17,9 @@ package org.springframework.boot.jetty.servlet; import jakarta.servlet.ServletException; -import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; -import org.eclipse.jetty.ee10.webapp.Configuration; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.webapp.AbstractConfiguration; +import org.eclipse.jetty.ee11.webapp.Configuration; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.springframework.boot.web.server.servlet.ServletContextInitializers; import org.springframework.boot.web.servlet.ServletContextInitializer; diff --git a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyServerPropertiesTests.java b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyServerPropertiesTests.java index 5369cc634a1..4793e758588 100644 --- a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyServerPropertiesTests.java +++ b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyServerPropertiesTests.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.jupiter.api.Test; diff --git a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java index 19ab90209c1..1a8bd0f81dc 100644 --- a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java +++ b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/JettyWebServerFactoryCustomizerTests.java @@ -26,7 +26,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.SynchronousQueue; import java.util.function.Function; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.CustomRequestLog; diff --git a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfigurationTests.java b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfigurationTests.java index 10e4c06f5cc..9c665cb64a3 100644 --- a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfigurationTests.java +++ b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/reactive/JettyReactiveWebServerAutoConfigurationTests.java @@ -17,7 +17,7 @@ package org.springframework.boot.jetty.autoconfigure.reactive; import jakarta.websocket.server.ServerContainer; -import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee11.servlet.ServletContextHandler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.StatisticsHandler; import org.junit.jupiter.api.Test; diff --git a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfigurationTests.java b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfigurationTests.java index 70eaaabaee9..2a6ecce3cad 100644 --- a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfigurationTests.java +++ b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/autoconfigure/servlet/JettyServletWebServerAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.jetty.autoconfigure.servlet; import java.util.Map; import jakarta.servlet.Filter; -import org.eclipse.jetty.ee10.websocket.servlet.WebSocketUpgradeFilter; +import org.eclipse.jetty.ee11.websocket.servlet.WebSocketUpgradeFilter; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.Test; diff --git a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactoryTests.java b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactoryTests.java index 72aa2d71b57..f37cf6f72ef 100644 --- a/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactoryTests.java +++ b/module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactoryTests.java @@ -42,11 +42,11 @@ import org.apache.hc.core5.http.HttpResponse; import org.apache.jasper.servlet.JspServlet; import org.assertj.core.api.InstanceOfAssertFactories; import org.awaitility.Awaitility; -import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; -import org.eclipse.jetty.ee10.servlet.ServletHolder; -import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; -import org.eclipse.jetty.ee10.webapp.Configuration; -import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee11.servlet.ErrorPageErrorHandler; +import org.eclipse.jetty.ee11.servlet.ServletHolder; +import org.eclipse.jetty.ee11.webapp.AbstractConfiguration; +import org.eclipse.jetty.ee11.webapp.Configuration; +import org.eclipse.jetty.ee11.webapp.WebAppContext; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; diff --git a/module/spring-boot-tracing/build.gradle b/module/spring-boot-tracing/build.gradle index ae96f8ba0a7..5c6b8b38554 100644 --- a/module/spring-boot-tracing/build.gradle +++ b/module/spring-boot-tracing/build.gradle @@ -60,7 +60,7 @@ dependencies { testImplementation("io.micrometer:micrometer-registry-prometheus") testImplementation("io.opentelemetry:opentelemetry-exporter-common") testImplementation("io.prometheus:prometheus-metrics-exposition-formats") - testImplementation("org.eclipse.jetty.ee10:jetty-ee10-webapp") + testImplementation("org.eclipse.jetty.ee11:jetty-ee11-webapp") testImplementation("org.eclipse.jetty.http2:jetty-http2-server") testRuntimeOnly("ch.qos.logback:logback-classic") diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 97908865bff..559c691c1d2 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1005,13 +1005,13 @@ bom { ] } } - library("Jetty", "12.0.25") { + library("Jetty", "12.1.0") { prohibit { contains ".alpha" because "we don't want alpha dependencies" } - group("org.eclipse.jetty.ee10") { - bom("jetty-ee10-bom") + group("org.eclipse.jetty.ee11") { + bom("jetty-ee11-bom") } group("org.eclipse.jetty") { bom("jetty-bom") diff --git a/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle b/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle index 4affa544a8e..dfd5b4df72c 100644 --- a/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle +++ b/smoke-test/spring-boot-smoke-test-jetty-jsp/build.gradle @@ -33,7 +33,7 @@ dependencies { exclude module: "spring-boot-starter-tomcat" } - providedRuntime("org.eclipse.jetty.ee10:jetty-ee10-apache-jsp") + providedRuntime("org.eclipse.jetty.ee11:jetty-ee11-apache-jsp") runtimeOnly("org.glassfish.web:jakarta.servlet.jsp.jstl") diff --git a/smoke-test/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties index b3b89e953ed..7109928e6db 100644 --- a/smoke-test/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties +++ b/smoke-test/spring-boot-smoke-test-jetty-jsp/src/main/resources/application.properties @@ -1,4 +1,4 @@ application.message: Hello Spring Boot -server.servlet.jsp.class-name=org.eclipse.jetty.ee10.jsp.JettyJspServlet +server.servlet.jsp.class-name=org.eclipse.jetty.ee11.jsp.JettyJspServlet spring.mvc.view.prefix: /WEB-INF/jsp/ spring.mvc.view.suffix: .jsp diff --git a/starter/spring-boot-starter-jetty/build.gradle b/starter/spring-boot-starter-jetty/build.gradle index 980e59dfa8e..35521a0f22a 100644 --- a/starter/spring-boot-starter-jetty/build.gradle +++ b/starter/spring-boot-starter-jetty/build.gradle @@ -29,11 +29,11 @@ dependencies { api("jakarta.websocket:jakarta.websocket-api") api("jakarta.websocket:jakarta.websocket-client-api") api("org.apache.tomcat.embed:tomcat-embed-el") - api("org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server") { + api("org.eclipse.jetty.ee11.websocket:jetty-ee11-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") { + api("org.eclipse.jetty.ee11.websocket:jetty-ee11-websocket-jetty-server") { exclude group: "jakarta.el", module: "jakarta.el-api" exclude group: "org.eclipse.jetty", module: "jetty-jndi" }