Skip to content

Commit e0f9344

Browse files
committed
Upgrade to Jetty 12.0.9
Closes gh-40724
1 parent 96bdf1a commit e0f9344

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ bom {
678678
]
679679
}
680680
}
681-
library("Jetty", "12.0.8") {
681+
library("Jetty", "12.0.9") {
682682
group("org.eclipse.jetty.ee10") {
683683
imports = [
684684
"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

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
4545
import org.eclipse.jetty.ee10.servlet.ServletHolder;
4646
import org.eclipse.jetty.ee10.webapp.AbstractConfiguration;
47-
import org.eclipse.jetty.ee10.webapp.ClassMatcher;
4847
import org.eclipse.jetty.ee10.webapp.Configuration;
4948
import org.eclipse.jetty.ee10.webapp.WebAppContext;
5049
import org.eclipse.jetty.server.AbstractConnector;
@@ -54,6 +53,7 @@
5453
import org.eclipse.jetty.server.Server;
5554
import org.eclipse.jetty.server.ServerConnector;
5655
import org.eclipse.jetty.server.SslConnectionFactory;
56+
import org.eclipse.jetty.util.ClassMatcher;
5757
import org.eclipse.jetty.util.ssl.SslContextFactory;
5858
import org.eclipse.jetty.util.thread.QueuedThreadPool;
5959
import org.eclipse.jetty.util.thread.ThreadPool;
@@ -193,8 +193,8 @@ void jettyConfigurations() throws Exception {
193193
Configuration mockConfiguration(Class<? extends Configuration> type) {
194194
Configuration mock = mock(type);
195195
ClassMatcher classMatcher = new ClassMatcher();
196-
given(mock.getSystemClasses()).willReturn(classMatcher);
197-
given(mock.getServerClasses()).willReturn(classMatcher);
196+
given(mock.getProtectedClasses()).willReturn(classMatcher);
197+
given(mock.getHiddenClasses()).willReturn(classMatcher);
198198
return mock;
199199
}
200200

@@ -545,7 +545,7 @@ void shouldApplyMaxConnections() {
545545
}
546546

547547
@Test
548-
void shouldApplyingMaxConnectionUseConnector() throws Exception {
548+
void shouldApplyingMaxConnectionUseConnector() {
549549
JettyServletWebServerFactory factory = getFactory();
550550
factory.setMaxConnections(1);
551551
this.webServer = factory.getWebServer();

0 commit comments

Comments
 (0)