Skip to content

Commit bc43656

Browse files
committed
Upgrade to Jetty 12.0.9
Closes gh-40743
1 parent 254ff47 commit bc43656

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

spring-boot-project/spring-boot-dependencies/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ bom {
855855
]
856856
}
857857
}
858-
library("Jetty", "12.0.8") {
858+
library("Jetty", "12.0.9") {
859859
group("org.eclipse.jetty.ee10") {
860860
imports = [
861861
"jetty-ee10-bom"

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.springframework.boot.web.embedded.jetty;
1818

1919
import org.eclipse.jetty.ee10.servlet.ServletHandler;
20-
import org.eclipse.jetty.ee10.webapp.ClassMatcher;
2120
import org.eclipse.jetty.ee10.webapp.WebAppContext;
21+
import org.eclipse.jetty.util.ClassMatcher;
2222

2323
/**
2424
* Jetty {@link WebAppContext} used by {@link JettyWebServer} to support deferred
@@ -29,8 +29,7 @@
2929
class JettyEmbeddedWebAppContext extends WebAppContext {
3030

3131
JettyEmbeddedWebAppContext() {
32-
setServerClassMatcher(new ClassMatcher("org.springframework.boot.loader."));
33-
// setTempDirectory(WebInfConfiguration.getCanonicalNameForWebAppTmpDir(this));
32+
setHiddenClassMatcher(new ClassMatcher("org.springframework.boot.loader."));
3433
}
3534

3635
@Override

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
4646
import org.eclipse.jetty.ee10.servlet.ServletHolder;
4747
import org.eclipse.jetty.ee10.webapp.AbstractConfiguration;
48-
import org.eclipse.jetty.ee10.webapp.ClassMatcher;
4948
import org.eclipse.jetty.ee10.webapp.Configuration;
5049
import org.eclipse.jetty.ee10.webapp.WebAppContext;
5150
import org.eclipse.jetty.server.AbstractConnector;
@@ -55,6 +54,7 @@
5554
import org.eclipse.jetty.server.Server;
5655
import org.eclipse.jetty.server.ServerConnector;
5756
import org.eclipse.jetty.server.SslConnectionFactory;
57+
import org.eclipse.jetty.util.ClassMatcher;
5858
import org.eclipse.jetty.util.ssl.SslContextFactory;
5959
import org.eclipse.jetty.util.thread.QueuedThreadPool;
6060
import org.eclipse.jetty.util.thread.ThreadPool;
@@ -196,8 +196,8 @@ void jettyConfigurations() throws Exception {
196196
Configuration mockConfiguration(Class<? extends Configuration> type) {
197197
Configuration mock = mock(type);
198198
ClassMatcher classMatcher = new ClassMatcher();
199-
given(mock.getSystemClasses()).willReturn(classMatcher);
200-
given(mock.getServerClasses()).willReturn(classMatcher);
199+
given(mock.getProtectedClasses()).willReturn(classMatcher);
200+
given(mock.getHiddenClasses()).willReturn(classMatcher);
201201
return mock;
202202
}
203203

0 commit comments

Comments
 (0)