From e0f93448f625561db4c816c9ea3a28dc1aed0083 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Mon, 13 May 2024 13:33:10 +0100
Subject: [PATCH] Upgrade to Jetty 12.0.9

Closes gh-40724
---
 spring-boot-project/spring-boot-dependencies/build.gradle | 2 +-
 .../web/embedded/jetty/JettyEmbeddedWebAppContext.java    | 5 ++---
 .../embedded/jetty/JettyServletWebServerFactoryTests.java | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 5f74f4b7f9..a940b15f6e 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -678,7 +678,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 d583483a3d..3bc9f30bbf 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 @@ import org.eclipse.jetty.ee10.webapp.WebAppContext;
 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 acac3103c0..a146c7ec5a 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
@@ -44,7 +44,6 @@ 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.ClassMatcher;
 import org.eclipse.jetty.ee10.webapp.Configuration;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
 import org.eclipse.jetty.server.AbstractConnector;
@@ -54,6 +53,7 @@ import org.eclipse.jetty.server.Handler;
 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;
@@ -193,8 +193,8 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT
 	Configuration mockConfiguration(Class<? extends Configuration> 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;
 	}
 
@@ -545,7 +545,7 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT
 	}
 
 	@Test
-	void shouldApplyingMaxConnectionUseConnector() throws Exception {
+	void shouldApplyingMaxConnectionUseConnector() {
 		JettyServletWebServerFactory factory = getFactory();
 		factory.setMaxConnections(1);
 		this.webServer = factory.getWebServer();