From 3578ab87680e3fd641940ceafc5e177283a5a28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:22:58 +0200 Subject: [PATCH 01/14] Upgrade to Jersey 3.1.11 Closes gh-46723 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 0863a1b4016..bfabeba9edd 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -987,7 +987,7 @@ bom { releaseNotes("https://github.com/redis/jedis/releases/tag/v{version}") } } - library("Jersey", "3.1.10") { + library("Jersey", "3.1.11") { group("org.glassfish.jersey") { bom("jersey-bom") } From f2d0712edc187df6ad09fd5d98e327543ccee42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:23:02 +0200 Subject: [PATCH 02/14] Upgrade to Tomcat 10.1.44 Closes gh-46724 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 57b2ab48ed2..38bfce09081 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6 snakeYamlVersion=2.3 springFrameworkVersion=6.2.10-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.43 +tomcatVersion=10.1.44 kotlin.stdlib.default.dependency=false From d04d7e3ef9896a985557bafbd3743b8d90674255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:35:42 +0200 Subject: [PATCH 03/14] Upgrade to Angus Mail 2.0.4 Closes gh-46725 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2c8c85d85dc..e93d624499c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -47,7 +47,7 @@ bom { .formatted(version.componentInts())) } } - library("Angus Mail", "2.0.3") { + library("Angus Mail", "2.0.4") { group("org.eclipse.angus") { modules = [ "angus-core", From 4782be305b278acaebc180ee7575f425e35e44fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:35:46 +0200 Subject: [PATCH 04/14] Upgrade to AssertJ 3.27.4 Closes gh-46726 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f96f0bc7747..1238361f339 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.caching=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 -assertjVersion=3.27.3 +assertjVersion=3.27.4 checkstyleToolVersion=10.12.4 commonsCodecVersion=1.18.0 graalVersion=22.3 From 4437a71476eb4256726a639e657fb9b694e94b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:35:50 +0200 Subject: [PATCH 05/14] Upgrade to Hibernate 6.6.24.Final Closes gh-46727 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e93d624499c..2ed5a5166a5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -554,7 +554,7 @@ bom { releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}") } } - library("Hibernate", "6.6.22.Final") { + library("Hibernate", "6.6.24.Final") { prohibit { versionRange "[7.0.0.Alpha1,)" because "it exceeds our Jakarta EE 10 baseline" From 3b299938a913ed5673d27ce940766e8d59177c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:35:54 +0200 Subject: [PATCH 06/14] Upgrade to Hibernate Validator 8.0.3.Final Closes gh-46728 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 2ed5a5166a5..8ea862cee72 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -590,7 +590,7 @@ bom { .formatted(version.major(), version.minor())) } } - library("Hibernate Validator", "8.0.2.Final") { + library("Hibernate Validator", "8.0.3.Final") { prohibit { versionRange "[9.0.0.Beta2,)" because "it exceeds our Jakarta EE 10 baseline" From 7bec08cc4eedfe1762f414f0f7807b887aea73d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:35:58 +0200 Subject: [PATCH 07/14] Upgrade to HikariCP 6.3.2 Closes gh-46729 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8ea862cee72..a9f6fc44568 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -602,7 +602,7 @@ bom { ] } } - library("HikariCP", "6.3.1") { + library("HikariCP", "6.3.2") { group("com.zaxxer") { modules = [ "HikariCP" From bb3aa209b66c74c51fc40e60c4fd10d8d0d1b49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:36:02 +0200 Subject: [PATCH 08/14] Upgrade to Jersey 3.1.11 Closes gh-46730 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a9f6fc44568..5e7ac1d4e06 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1041,7 +1041,7 @@ bom { releaseNotes("https://github.com/redis/jedis/releases/tag/v{version}") } } - library("Jersey", "3.1.10") { + library("Jersey", "3.1.11") { prohibit { versionRange "[4.0.0-M1,)" because "it exceeds our Jakarta EE 10 baseline" From fd4cf76c8f26fee4f2041603d32e51263645e122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:36:05 +0200 Subject: [PATCH 09/14] Upgrade to Jetty 12.0.24 Closes gh-46731 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5e7ac1d4e06..1be720152c5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1062,7 +1062,7 @@ bom { ] } } - library("Jetty", "12.0.23") { + library("Jetty", "12.0.24") { prohibit { contains ".alpha" because "we don't want alpha dependencies" From 37f99d22fda7135adae6ed40b26dbb26fabfe4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:36:09 +0200 Subject: [PATCH 10/14] Upgrade to MySQL 9.4.0 Closes gh-46732 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 1be720152c5..cfe7f4c90b1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1659,7 +1659,7 @@ bom { .formatted(version.toString().replace(".jre11", ""))) } } - library("MySQL", "9.3.0") { + library("MySQL", "9.4.0") { upgradePolicy = "same-major-version" group("com.mysql") { modules = [ From 13eeae2821afe5e37ffab3df26d220a339bc26f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:36:13 +0200 Subject: [PATCH 11/14] Upgrade to Pulsar 4.0.6 Closes gh-46733 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index cfe7f4c90b1..285df146ca3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1836,7 +1836,7 @@ bom { releaseNotes("https://github.com/prometheus/client_java/releases/tag/parent-{version}") } } - library("Pulsar", "4.0.5") { + library("Pulsar", "4.0.6") { group("org.apache.pulsar") { bom("pulsar-bom") { permit("org.apache.maven.plugin-tools:maven-plugin-annotations") From d4037f53c57f4bf83717f069600f2c968a1165f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:36:17 +0200 Subject: [PATCH 12/14] Upgrade to Tomcat 10.1.44 Closes gh-46734 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1238361f339..68c6f28247e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6 snakeYamlVersion=2.4 springFrameworkVersion=6.2.10-SNAPSHOT springFramework60xVersion=6.0.23 -tomcatVersion=10.1.43 +tomcatVersion=10.1.44 kotlin.stdlib.default.dependency=false From c4f2922b600fe1bac8a027aadb00e840d1f4edee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:38:47 +0200 Subject: [PATCH 13/14] fixup! Upgrade to Pulsar 4.0.6 --- .../spring-boot-autoconfigure/build.gradle | 12 +++++++++--- spring-boot-project/spring-boot-docs/build.gradle | 8 ++++++-- .../spring-boot-starter-pulsar-reactive/build.gradle | 4 +++- .../spring-boot-starter-pulsar/build.gradle | 4 +++- .../spring-boot-testcontainers/build.gradle | 8 ++++++-- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 81d62c62b59..30770102477 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -53,7 +53,9 @@ dependencies { dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:mongodb") dockerTestImplementation("org.testcontainers:neo4j") - dockerTestImplementation("org.testcontainers:pulsar") + dockerTestImplementation("org.testcontainers:pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } dockerTestImplementation("org.testcontainers:testcontainers") optional("co.elastic.clients:elasticsearch-java") { @@ -207,8 +209,12 @@ dependencies { optional("org.springframework.data:spring-data-redis") optional("org.springframework.graphql:spring-graphql") optional("org.springframework.hateoas:spring-hateoas") - optional("org.springframework.pulsar:spring-pulsar") - optional("org.springframework.pulsar:spring-pulsar-reactive") + optional("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } + optional("org.springframework.pulsar:spring-pulsar-reactive") { + exclude group: "commons-logging", module: "commons-logging" + } optional("org.springframework.security:spring-security-acl") optional("org.springframework.security:spring-security-config") optional("org.springframework.security:spring-security-data") diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index fc6d02d6e11..cb78d40ddda 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -157,8 +157,12 @@ dependencies { implementation("org.springframework.kafka:spring-kafka-test") { exclude group: "commons-logging", module: "commons-logging" } - implementation("org.springframework.pulsar:spring-pulsar") - implementation("org.springframework.pulsar:spring-pulsar-reactive") + implementation("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } + implementation("org.springframework.pulsar:spring-pulsar-reactive") { + exclude group: "commons-logging", module: "commons-logging" + } implementation("org.springframework.restdocs:spring-restdocs-mockmvc") implementation("org.springframework.restdocs:spring-restdocs-restassured") implementation("org.springframework.restdocs:spring-restdocs-webtestclient") diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle index 672670780c8..0a71a42c112 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle @@ -22,7 +22,9 @@ description = "Starter for using Spring for Apache Pulsar Reactive" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) - api("org.springframework.pulsar:spring-pulsar-reactive") + api("org.springframework.pulsar:spring-pulsar-reactive") { + exclude group: "commons-logging", module: "commons-logging" + } } checkRuntimeClasspathForConflicts { diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle index f9e8a895276..69505deadb6 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle @@ -22,7 +22,9 @@ description = "Starter for using Spring for Apache Pulsar" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) - api("org.springframework.pulsar:spring-pulsar") + api("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } } checkRuntimeClasspathForConflicts { diff --git a/spring-boot-project/spring-boot-testcontainers/build.gradle b/spring-boot-project/spring-boot-testcontainers/build.gradle index 84e38cb8651..c7861bb4678 100644 --- a/spring-boot-project/spring-boot-testcontainers/build.gradle +++ b/spring-boot-project/spring-boot-testcontainers/build.gradle @@ -65,7 +65,9 @@ dependencies { dockerTestImplementation("org.springframework.data:spring-data-redis") dockerTestImplementation("org.springframework.kafka:spring-kafka") dockerTestImplementation("org.springframework.ldap:spring-ldap-core") - dockerTestImplementation("org.springframework.pulsar:spring-pulsar") + dockerTestImplementation("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc") @@ -115,7 +117,9 @@ dependencies { testImplementation("org.springframework.amqp:spring-rabbit") testImplementation("org.springframework.data:spring-data-redis") testImplementation("org.springframework.kafka:spring-kafka") - testImplementation("org.springframework.pulsar:spring-pulsar") + testImplementation("org.springframework.pulsar:spring-pulsar") { + exclude group: "commons-logging", module: "commons-logging" + } testImplementation("org.testcontainers:junit-jupiter") } From 31179d771d88ce1f287a7dd9a47528668d160c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 8 Aug 2025 15:39:53 +0200 Subject: [PATCH 14/14] fixup! Upgrade to Jetty 12.0.24 --- .../web/embedded/jetty/JettyReactiveWebServerFactory.java | 4 ++-- .../web/embedded/jetty/JettyServletWebServerFactory.java | 4 ++-- .../jetty/JettyReactiveWebServerFactoryTests.java | 6 +++--- .../embedded/jetty/JettyServletWebServerFactoryTests.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java index 057c7fa97f8..3805048b9c5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactory.java @@ -31,10 +31,10 @@ import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.ConnectionFactory; -import org.eclipse.jetty.server.ConnectionLimit; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.NetworkConnectionLimit; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.StatisticsHandler; @@ -189,7 +189,7 @@ public class JettyReactiveWebServerFactory extends AbstractReactiveWebServerFact server.setHandler(addHandlerWrappers(contextHandler)); JettyReactiveWebServerFactory.logger.info("Server initialized with port: " + port); if (this.maxConnections > -1) { - server.addBean(new ConnectionLimit(this.maxConnections, server)); + server.addBean(new NetworkConnectionLimit(this.maxConnections, server)); } if (Ssl.isEnabled(getSsl())) { customizeSsl(server, address); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java index 30dcff93bcd..86a616152eb 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java @@ -55,12 +55,12 @@ import org.eclipse.jetty.http.SetCookieParser; import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory; import org.eclipse.jetty.server.AbstractConnector; import org.eclipse.jetty.server.ConnectionFactory; -import org.eclipse.jetty.server.ConnectionLimit; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; 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; @@ -175,7 +175,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor server.setHandler(addHandlerWrappers(context)); this.logger.info("Server initialized with port: " + port); if (this.maxConnections > -1) { - server.addBean(new ConnectionLimit(this.maxConnections, server.getConnectors())); + server.addBean(new NetworkConnectionLimit(this.maxConnections, server.getConnectors())); } if (Ssl.isEnabled(getSsl())) { customizeSsl(server, address); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java index c02b568a298..0686431c2f9 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java @@ -23,8 +23,8 @@ import java.util.Arrays; 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; @@ -145,9 +145,9 @@ class JettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor 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 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 e1d6da2bdff..53d3706a422 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 @@ -48,9 +48,9 @@ import org.eclipse.jetty.ee10.webapp.AbstractConfiguration; 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; @@ -562,9 +562,9 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT 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 @@ -574,7 +574,7 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT 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);