Merge branch '3.3.x'

Closes gh-42304
spring-projects · Sep 13, 2024 · 27169a9 · 27169a9
2 parents 403d3fe + 6c36c82
commit 27169a9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -2261,11 +2261,7 @@ bom {
 			]
 		}
 	}
-	library("Undertow", "2.3.13.Final") {
-		prohibit {
-			versionRange "[2.3.14.Final,2.3.15.Final]"
-			because "it contains a regression (https://issues.redhat.com/browse/UNDERTOW-2420)"
-		}
+	library("Undertow", "2.3.17.Final") {
 		group("io.undertow") {
 			modules = [
 				"undertow-core",

diff --git a/.../org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java b/.../org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java
@@ -243,6 +243,13 @@ void whenServerIsShuttingDownARequestOnAnIdleConnectionAreRejectedWithServiceUna
 		this.webServer.stop();
 	}
 
+	@Test
+	@Override
+	@Disabled("https://issues.redhat.com/browse/UNDERTOW-2420")
+	protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
+		super.portClashOfSecondaryConnectorResultsInPortInUseException();
+	}
+
 	@Test
 	@Override
 	@Disabled("Restart after stop is not supported with Undertow")

diff --git a/...ava/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/...ava/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java
@@ -1078,7 +1078,7 @@ protected void portClashOfPrimaryConnectorResultsInPortInUseException() throws E
 	}
 
 	@Test
-	void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
+	protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
 		doWithBlockedPort((port) -> {
 			assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> {
 				AbstractServletWebServerFactory factory = getFactory();