Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42303
This commit is contained in:
Stéphane Nicoll
2024-09-13 16:27:13 +02:00
parent 988e083fef e6e7357303
commit 6c36c82376
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -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",

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

@@ -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")

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

@@ -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();