Skip to content

Commit 27169a9

Browse files
committed
Merge branch '3.3.x'
Closes gh-42304
2 parents 403d3fe + 6c36c82 commit 27169a9

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
@@ -2261,11 +2261,7 @@ bom {
22612261
]
22622262
}
22632263
}
2264-
library("Undertow", "2.3.13.Final") {
2265-
prohibit {
2266-
versionRange "[2.3.14.Final,2.3.15.Final]"
2267-
because "it contains a regression (https://issues.redhat.com/browse/UNDERTOW-2420)"
2268-
}
2264+
library("Undertow", "2.3.17.Final") {
22692265
group("io.undertow") {
22702266
modules = [
22712267
"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
@@ -1078,7 +1078,7 @@ protected void portClashOfPrimaryConnectorResultsInPortInUseException() throws E
10781078
}
10791079

10801080
@Test
1081-
void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
1081+
protected void portClashOfSecondaryConnectorResultsInPortInUseException() throws Exception {
10821082
doWithBlockedPort((port) -> {
10831083
assertThatExceptionOfType(RuntimeException.class).isThrownBy(() -> {
10841084
AbstractServletWebServerFactory factory = getFactory();

0 commit comments

Comments
 (0)