From bc436564e2bcaef8ad9dea61c3b170d0ff4af7ae Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 May 2024 15:50:15 +0100 Subject: [PATCH] Upgrade to Jetty 12.0.9 Closes gh-40743 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java | 5 ++--- .../embedded/jetty/JettyServletWebServerFactoryTests.java | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index ee01438030e5..ccb3d1c06c14 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.8") { + library("Jetty", "12.0.9") { group("org.eclipse.jetty.ee10") { imports = [ "jetty-ee10-bom" diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java index d583483a3ddb..3bc9f30bbf86 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java @@ -17,8 +17,8 @@ package org.springframework.boot.web.embedded.jetty; import org.eclipse.jetty.ee10.servlet.ServletHandler; -import org.eclipse.jetty.ee10.webapp.ClassMatcher; import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.util.ClassMatcher; /** * Jetty {@link WebAppContext} used by {@link JettyWebServer} to support deferred @@ -29,8 +29,7 @@ class JettyEmbeddedWebAppContext extends WebAppContext { JettyEmbeddedWebAppContext() { - setServerClassMatcher(new ClassMatcher("org.springframework.boot.loader.")); - // setTempDirectory(WebInfConfiguration.getCanonicalNameForWebAppTmpDir(this)); + setHiddenClassMatcher(new ClassMatcher("org.springframework.boot.loader.")); } @Override diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java index 846be216ecc6..3bd6529897ee 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java @@ -45,7 +45,6 @@ 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.ClassMatcher; import org.eclipse.jetty.ee10.webapp.Configuration; import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.eclipse.jetty.server.AbstractConnector; @@ -55,6 +54,7 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.SslConnectionFactory; +import org.eclipse.jetty.util.ClassMatcher; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.ThreadPool; @@ -196,8 +196,8 @@ void jettyConfigurations() throws Exception { Configuration mockConfiguration(Class type) { Configuration mock = mock(type); ClassMatcher classMatcher = new ClassMatcher(); - given(mock.getSystemClasses()).willReturn(classMatcher); - given(mock.getServerClasses()).willReturn(classMatcher); + given(mock.getProtectedClasses()).willReturn(classMatcher); + given(mock.getHiddenClasses()).willReturn(classMatcher); return mock; }