Skip to content

Commit e6e7357

Browse files
committed
Upgrade to Undertow 2.3.17.Final
Closes gh-42302
1 parent d3861bc commit e6e7357

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,11 +1765,7 @@ bom {
17651765
]
17661766
}
17671767
}
1768-
library("Undertow", "2.3.13.Final") {
1769-
prohibit {
1770-
versionRange "[2.3.14.Final,2.3.15.Final]"
1771-
because "it contains a regression (https://issues.redhat.com/browse/UNDERTOW-2420)"
1772-
}
1768+
library("Undertow", "2.3.17.Final") {
17731769
group("io.undertow") {
17741770
modules = [
17751771
"undertow-core",

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,13 @@ void whenServerIsShuttingDownARequestOnAnIdleConnectionAreRejectedWithServiceUna
243243
this.webServer.stop();
244244
}
245245

246+
@Test
247+
@Override
248+
@Disabled("https://issues.redhat.com/browse/UNDERTOW-2420")
249+
protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
250+
super.portClashOfSecondaryConnectorResultsInPortInUseException();
251+
}
252+
246253
@Test
247254
@Override
248255
@Disabled("Restart after stop is not supported with Undertow")

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ protected void portClashOfPrimaryConnectorResultsInPortInUseException() throws E
10941094
}
10951095

10961096
@Test
1097-
void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
1097+
protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
10981098
doWithBlockedPort((port) -> {
10991099
assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> {
11001100
AbstractServletWebServerFactory factory = getFactory();

0 commit comments

Comments
 (0)