root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Upgrade to Jetty 12.0.9 

Closes gh-40743
This commit is contained in:
Andy Wilkinson 2024-05-13 15:50:15 +01:00
parent 254ff47ed6
commit bc436564e2
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -855,7 +855,7 @@ bom {
] ]
} }
} }
library("Jetty", "12.0.8") { library("Jetty", "12.0.9") {
group("org.eclipse.jetty.ee10") { group("org.eclipse.jetty.ee10") {
imports = [ imports = [
"jetty-ee10-bom" "jetty-ee10-bom"

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyEmbeddedWebAppContext.java
View File

@ -17,8 +17,8 @@
package org.springframework.boot.web.embedded.jetty; package org.springframework.boot.web.embedded.jetty;
import org.eclipse.jetty.ee10.servlet.ServletHandler; 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.ee10.webapp.WebAppContext;
import org.eclipse.jetty.util.ClassMatcher;
/** /**
* Jetty {@link WebAppContext} used by {@link JettyWebServer} to support deferred * Jetty {@link WebAppContext} used by {@link JettyWebServer} to support deferred
@ -29,8 +29,7 @@ import org.eclipse.jetty.ee10.webapp.WebAppContext;
class JettyEmbeddedWebAppContext extends WebAppContext { class JettyEmbeddedWebAppContext extends WebAppContext {
JettyEmbeddedWebAppContext() { JettyEmbeddedWebAppContext() {
setServerClassMatcher(new ClassMatcher("org.springframework.boot.loader.")); setHiddenClassMatcher(new ClassMatcher("org.springframework.boot.loader."));
// setTempDirectory(WebInfConfiguration.getCanonicalNameForWebAppTmpDir(this));
} }
@Override @Override

6
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
View File

@ -45,7 +45,6 @@ import org.awaitility.Awaitility;
import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; 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.Configuration;
import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.AbstractConnector;
@ -55,6 +54,7 @@ import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.util.ClassMatcher;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool; import org.eclipse.jetty.util.thread.ThreadPool;
@ -196,8 +196,8 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT
Configuration mockConfiguration(Class<? extends Configuration> type) { Configuration mockConfiguration(Class<? extends Configuration> type) {
Configuration mock = mock(type); Configuration mock = mock(type);
ClassMatcher classMatcher = new ClassMatcher(); ClassMatcher classMatcher = new ClassMatcher();
given(mock.getSystemClasses()).willReturn(classMatcher); given(mock.getProtectedClasses()).willReturn(classMatcher);
given(mock.getServerClasses()).willReturn(classMatcher); given(mock.getHiddenClasses()).willReturn(classMatcher);
return mock; return mock;
} }