From e6e7357303e4e94503a8ce2d977fd25069421c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 13 Sep 2024 16:24:43 +0200 Subject: [PATCH] Upgrade to Undertow 2.3.17.Final Closes gh-42302 --- spring-boot-project/spring-boot-dependencies/build.gradle | 6 +----- .../undertow/UndertowServletWebServerFactoryTests.java | 7 +++++++ .../server/AbstractServletWebServerFactoryTests.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 3abac2435419..a242ca7813d6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1765,11 +1765,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 3c8a05cd6a94..ec7812ee82d8 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 @@ 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/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 f59f916aad64..c8081a9ab48a 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 @@ -1094,7 +1094,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();