diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index f5cf324fc2..a0753450fe 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2260,11 +2260,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/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java index 3c8a05cd6a..ec7812ee82 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java @@ -243,6 +243,13 @@ class UndertowServletWebServerFactoryTests extends AbstractServletWebServerFacto 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/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 4eb54319e6..9219de35c0 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -1078,7 +1078,7 @@ public abstract class AbstractServletWebServerFactoryTests { } @Test - void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception { + protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception { doWithBlockedPort((port) -> { assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> { AbstractServletWebServerFactory factory = getFactory();