Upgrade to Jetty 12.0.24

Closes gh-46741

Author: snicoll

module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/reactive/JettyReactiveWebServerFactory.java

@@ -22,7 +22,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
-import org.eclipse.jetty.server.ConnectionLimit;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.jspecify.annotations.Nullable;
@@ -109,7 +109,7 @@ protected Server createJettyServer(ServletHttpHandlerAdapter servlet) {
 		server.setHandler(addHandlerWrappers(contextHandler));
 		logger.info("Server initialized with port: " + port);
 		if (this.getMaxConnections() > -1) {
-			server.addBean(new ConnectionLimit(this.getMaxConnections(), server));
+			server.addBean(new NetworkConnectionLimit(this.getMaxConnections(), server));
 		}
 		if (Ssl.isEnabled(getSsl())) {
 			customizeSsl(server, address);

module/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactory.java

@@ -52,10 +52,10 @@
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.http.MimeTypes.Wrapper;
 import org.eclipse.jetty.http.SetCookieParser;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpCookieUtils;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
@@ -165,7 +165,7 @@ public WebServer getWebServer(ServletContextInitializer... initializers) {
 		server.setHandler(addHandlerWrappers(context));
 		logger.info("Server initialized with port: " + port);
 		if (this.getMaxConnections() > -1) {
-			server.addBean(new ConnectionLimit(this.getMaxConnections(), server.getConnectors()));
+			server.addBean(new NetworkConnectionLimit(this.getMaxConnections(), server.getConnectors()));
 		}
 		if (Ssl.isEnabled(getSsl())) {
 			customizeSsl(server, address);

module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/reactive/JettyReactiveWebServerFactoryTests.java

@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.awaitility.Awaitility;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.junit.jupiter.api.Disabled;
@@ -148,9 +148,9 @@ void shouldApplyMaxConnections() {
 		factory.setMaxConnections(1);
 		this.webServer = factory.getWebServer(new EchoHandler());
 		Server server = ((JettyWebServer) this.webServer).getServer();
-		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		NetworkConnectionLimit connectionLimit = server.getBean(NetworkConnectionLimit.class);
 		assertThat(connectionLimit).isNotNull();
-		assertThat(connectionLimit.getMaxConnections()).isOne();
+		assertThat(connectionLimit.getMaxNetworkConnectionCount()).isOne();
 	}
 
 	@Test

module/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/servlet/JettyServletWebServerFactoryTests.java

@@ -48,9 +48,9 @@
 import org.eclipse.jetty.ee10.webapp.Configuration;
 import org.eclipse.jetty.ee10.webapp.WebAppContext;
 import org.eclipse.jetty.server.AbstractConnector;
-import org.eclipse.jetty.server.ConnectionLimit;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.NetworkConnectionLimit;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
@@ -565,9 +565,9 @@ void shouldApplyMaxConnections() {
 		factory.setMaxConnections(1);
 		this.webServer = factory.getWebServer();
 		Server server = ((JettyWebServer) this.webServer).getServer();
-		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		NetworkConnectionLimit connectionLimit = server.getBean(NetworkConnectionLimit.class);
 		assertThat(connectionLimit).isNotNull();
-		assertThat(connectionLimit.getMaxConnections()).isOne();
+		assertThat(connectionLimit.getMaxNetworkConnectionCount()).isOne();
 	}
 
 	@Test
@@ -577,7 +577,7 @@ void shouldApplyMaxConnectionsToConnectors() {
 		this.webServer = factory.getWebServer();
 		Server server = ((JettyWebServer) this.webServer).getServer();
 		assertThat(server.getConnectors()).isEmpty();
-		ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
+		NetworkConnectionLimit connectionLimit = server.getBean(NetworkConnectionLimit.class);
 		assertThat(connectionLimit).extracting("_connectors")
 			.asInstanceOf(InstanceOfAssertFactories.list(AbstractConnector.class))
 			.hasSize(1);

platform/spring-boot-dependencies/build.gradle

@@ -1009,7 +1009,7 @@ bom {
 			]
 		}
 	}
-	library("Jetty", "12.0.23") {
+	library("Jetty", "12.0.24") {
 		prohibit {
 			contains ".alpha"
 			because "we don't want alpha dependencies"