From 8323cf3db63a95a0bcc44a79fd5096cbb6279d62 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Apr 2023 15:42:19 +0200 Subject: [PATCH 1/5] Upgrade to DB2 JDBC 11.5.8.0 Closes gh-34906 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 5159ebd3b50..55f16646aa7 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -254,7 +254,7 @@ bom { ] } } - library("DB2 JDBC", "11.5.7.0") { + library("DB2 JDBC", "11.5.8.0") { group("com.ibm.db2") { modules = [ "jcc" From ca48c6a03452ca7d6e9fe6a59162843efc00f4f4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Apr 2023 15:42:24 +0200 Subject: [PATCH 2/5] Upgrade to Groovy 3.0.17 Closes gh-34907 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 55f16646aa7..a3461323329 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -422,7 +422,7 @@ bom { ] } } - library("Groovy", "3.0.16") { + library("Groovy", "3.0.17") { group("org.codehaus.groovy") { imports = [ "groovy-bom" From abc7bd0c5f707cf39e5b56d67638eb91804ecca2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Apr 2023 15:42:29 +0200 Subject: [PATCH 3/5] Upgrade to Logback 1.2.12 Closes gh-34908 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a3461323329..b4bb6f29aa5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1178,7 +1178,7 @@ bom { ] } } - library("Logback", "1.2.11") { + library("Logback", "1.2.12") { group("ch.qos.logback") { modules = [ "logback-access", From e0d740fe85d7be1a185f40e11aa82542ef6fba6c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Apr 2023 15:42:34 +0200 Subject: [PATCH 4/5] Upgrade to Netty 4.1.91.Final Closes gh-34909 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b4bb6f29aa5..7770c0c5b14 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1394,7 +1394,7 @@ bom { ] } } - library("Netty", "4.1.90.Final") { + library("Netty", "4.1.91.Final") { group("io.netty") { imports = [ "netty-bom" From d823d7b0b1f342694743e267e7ea6033d06029e4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 7 Apr 2023 15:42:39 +0200 Subject: [PATCH 5/5] Upgrade to Undertow 2.2.24.Final Closes gh-34910 --- .../boot/autoconfigure/web/ServerProperties.java | 4 ++++ .../web/embedded/UndertowWebServerFactoryCustomizer.java | 1 + .../web/embedded/UndertowWebServerFactoryCustomizerTests.java | 1 + spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 3a0bca45aed..49f160cbb73 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -31,6 +31,7 @@ import java.util.Map; import io.undertow.UndertowOptions; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.DeprecatedConfigurationProperty; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.boot.convert.DurationUnit; import org.springframework.boot.web.server.Compression; @@ -1576,10 +1577,13 @@ public class ServerProperties { this.maxCookies = maxCookies; } + @Deprecated + @DeprecatedConfigurationProperty(reason = "This option was interpreted improperly") public boolean isAllowEncodedSlash() { return this.allowEncodedSlash; } + @Deprecated public void setAllowEncodedSlash(boolean allowEncodedSlash) { this.allowEncodedSlash = allowEncodedSlash; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java index 95f0bb3afe4..5a9abed8bd1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java @@ -87,6 +87,7 @@ public class UndertowWebServerFactoryCustomizer map.from(this::getOrDeduceUseForwardHeaders).to(factory::setUseForwardHeaders); } + @SuppressWarnings("deprecation") private void mapUndertowProperties(ConfigurableUndertowWebServerFactory factory, ServerOptions serverOptions) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull(); Undertow properties = this.serverProperties.getUndertow(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java index 6897cb9d628..e13f3eb0783 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java @@ -150,6 +150,7 @@ class UndertowWebServerFactoryCustomizerTests { } @Test + @Deprecated void allowEncodedSlashes() { bind("server.undertow.allow-encoded-slash=true"); assertThat(boundServerOption(UndertowOptions.ALLOW_ENCODED_SLASH)).isTrue(); diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 7770c0c5b14..ffce853bd00 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1955,7 +1955,7 @@ bom { ] } } - library("Undertow", "2.2.23.Final") { + library("Undertow", "2.2.24.Final") { group("io.undertow") { modules = [ "undertow-core",