From 9306d0868a74c8b3a6b5ec30f01d74e54cae07be Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:14:40 +0200 Subject: [PATCH 01/20] Upgrade to Dropwizard Metrics 4.2.19 Closes gh-35794 --- 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 f162bac48d..81bb36b613 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -283,7 +283,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.18") { + library("Dropwizard Metrics", "4.2.19") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 461f2fa05442479bf7e717684e6964ac59e2ea08 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:14:48 +0200 Subject: [PATCH 02/20] Upgrade to Infinispan 13.0.18.Final Closes gh-35795 --- 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 81bb36b613..d40e5def59 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -585,7 +585,7 @@ bom { ] } } - library("Infinispan", "13.0.15.Final") { + library("Infinispan", "13.0.18.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From ef90c11a1ada9b69f51f712db4e60f3688327937 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:14:52 +0200 Subject: [PATCH 03/20] Upgrade to Lombok 1.18.28 Closes gh-35796 --- 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 d40e5def59..b56e0be98a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1187,7 +1187,7 @@ bom { ] } } - library("Lombok", "1.18.26") { + library("Lombok", "1.18.28") { group("org.projectlombok") { modules = [ "lombok" From 0bd08a6233c99d3a972d60b6bce33061ca55f697 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:14:57 +0200 Subject: [PATCH 04/20] Upgrade to Netty 4.1.93.Final Closes gh-35797 --- 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 b56e0be98a..d8b18d1821 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.92.Final") { + library("Netty", "4.1.93.Final") { group("io.netty") { imports = [ "netty-bom" From 766ac6343bfe779697f273a63e81b73e7e2f76a9 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:19 +0200 Subject: [PATCH 05/20] Upgrade to Dropwizard Metrics 4.2.19 Closes gh-35803 --- 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 0048ebd5f8..d5e652ee25 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -206,7 +206,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.2.18") { + library("Dropwizard Metrics", "4.2.19") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 30bd14e7c535c2a92d1a55454b84788434c8139a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:25 +0200 Subject: [PATCH 06/20] Upgrade to Git Commit ID Plugin 5.0.1 Closes gh-35804 --- 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 d5e652ee25..603d26082c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -263,7 +263,7 @@ bom { ] } } - library("Git Commit ID Plugin", "5.0.0") { + library("Git Commit ID Plugin", "5.0.1") { group("io.github.git-commit-id") { plugins = [ "git-commit-id-maven-plugin" From 5ea5f593285dd1927dcfbd1c774c4f0e10b5ab2f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:30 +0200 Subject: [PATCH 07/20] Upgrade to HSQLDB 2.7.2 Closes gh-35805 --- 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 603d26082c..8dc5042361 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -365,7 +365,7 @@ bom { ] } } - library("HSQLDB", "2.7.1") { + library("HSQLDB", "2.7.2") { group("org.hsqldb") { modules = [ "hsqldb" From 3ef975e5969a37f845d16dcf03d55c608a15d1dc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:35 +0200 Subject: [PATCH 08/20] Upgrade to Infinispan 14.0.10.Final Closes gh-35806 --- 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 8dc5042361..74673341c4 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -431,7 +431,7 @@ bom { ] } } - library("Infinispan", "14.0.9.Final") { + library("Infinispan", "14.0.10.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From c2566ebffb3bf7b96ea68e3385ecb845faf9b134 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:40 +0200 Subject: [PATCH 09/20] Upgrade to Jakarta Json 2.1.2 Closes gh-35807 --- 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 74673341c4..2900ad38f3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -473,7 +473,7 @@ bom { ] } } - library("Jakarta Json", "2.1.1") { + library("Jakarta Json", "2.1.2") { group("jakarta.json") { modules = [ "jakarta.json-api" From daebfb28857348f47d477f952914811816fbfb52 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:46 +0200 Subject: [PATCH 10/20] Upgrade to Jakarta Mail 2.1.2 Closes gh-35808 --- 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 2900ad38f3..f811b8e0dc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -487,7 +487,7 @@ bom { ] } } - library("Jakarta Mail", "2.1.1") { + library("Jakarta Mail", "2.1.2") { group("jakarta.mail") { modules = [ "jakarta.mail-api" From 496c0e709f5fa17b1fb924cfcd72ae1247c63d50 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:51 +0200 Subject: [PATCH 11/20] Upgrade to JBoss Logging 3.5.1.Final Closes gh-35809 --- 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 f811b8e0dc..94343b6519 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -609,7 +609,7 @@ bom { ] } } - library("JBoss Logging", "3.5.0.Final") { + library("JBoss Logging", "3.5.1.Final") { group("org.jboss.logging") { modules = [ "jboss-logging" From 00aaecbcdd962536cf2b3af129fdf64f9d9d5f94 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:24:56 +0200 Subject: [PATCH 12/20] Upgrade to Lombok 1.18.28 Closes gh-35810 --- 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 94343b6519..0298139700 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -806,7 +806,7 @@ bom { ] } } - library("Lombok", "1.18.26") { + library("Lombok", "1.18.28") { group("org.projectlombok") { modules = [ "lombok" From 9f0a631700bad0f891bf62277b172346406440bf Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:25:01 +0200 Subject: [PATCH 13/20] Upgrade to Netty 4.1.93.Final Closes gh-35811 --- 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 0298139700..c08ad93989 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1025,7 +1025,7 @@ bom { ] } } - library("Netty", "4.1.92.Final") { + library("Netty", "4.1.93.Final") { group("io.netty") { imports = [ "netty-bom" From fa7d79b7b0745fec72515c085ab564eaf1d74557 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:25:07 +0200 Subject: [PATCH 14/20] Upgrade to Tomcat 10.1.9 Closes gh-35812 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a11945935d..ba723e094b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.22 springFrameworkVersion=6.0.10-SNAPSHOT -tomcatVersion=10.1.8 +tomcatVersion=10.1.9 kotlin.stdlib.default.dependency=false From c55d9e152cd08953d4e0fa4531b4cbf75a993b5e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:15:07 +0200 Subject: [PATCH 15/20] Upgrade to Tomcat 9.0.76 Closes gh-35799 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b08fc7c7c3..67bbcdbf90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.6.21 springFrameworkVersion=5.3.28-SNAPSHOT -tomcatVersion=9.0.75 +tomcatVersion=9.0.76 kotlin.stdlib.default.dependency=false From 1201d8fa010753f6321fc779da63e5d941744c35 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:15:12 +0200 Subject: [PATCH 16/20] Upgrade to UnboundID LDAPSDK 6.0.9 Closes gh-35800 --- 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 d8b18d1821..afd862222a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1948,7 +1948,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "6.0.8") { + library("UnboundID LDAPSDK", "6.0.9") { group("com.unboundid") { modules = [ "unboundid-ldapsdk" From ad0ce41f8a34cce50cf34b16aa5f066deb6c35e5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 13:15:16 +0200 Subject: [PATCH 17/20] Upgrade to Undertow 2.2.25.Final Closes gh-35801 --- 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 afd862222a..1bf74c0659 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.24.Final") { + library("Undertow", "2.2.25.Final") { group("io.undertow") { modules = [ "undertow-core", From 39276f83027dd397b9fa90242c1928e469411eb8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 16 May 2023 19:46:43 +0100 Subject: [PATCH 18/20] Adapt to deprecation of rejectIllegalHeader Closes gh-35442 --- .../boot/autoconfigure/web/ServerProperties.java | 2 ++ .../web/embedded/TomcatWebServerFactoryCustomizer.java | 1 + .../web/embedded/TomcatWebServerFactoryCustomizerTests.java | 2 ++ 3 files changed, 5 insertions(+) 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 ad1ee24fef..527849b619 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 @@ -473,6 +473,7 @@ public class ServerProperties { /** * Whether to reject requests with illegal header names or values. */ + @Deprecated private boolean rejectIllegalHeader = true; /** @@ -626,6 +627,7 @@ public class ServerProperties { this.connectionTimeout = connectionTimeout; } + @DeprecatedConfigurationProperty(reason = "The setting has been deprecated in Tomcat") public boolean isRejectIllegalHeader() { return this.rejectIllegalHeader; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java index 6bcf48a865..07afdce6ee 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java @@ -215,6 +215,7 @@ public class TomcatWebServerFactoryCustomizer factory.addConnectorCustomizers((connector) -> connector.setProperty("relaxedQueryChars", relaxedChars)); } + @SuppressWarnings("deprecation") private void customizeRejectIllegalHeader(ConfigurableTomcatWebServerFactory factory, boolean rejectIllegalHeader) { factory.addConnectorCustomizers((connector) -> { ProtocolHandler handler = connector.getProtocolHandler(); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java index ff433ffbf8..f1684617ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java @@ -367,6 +367,8 @@ class TomcatWebServerFactoryCustomizerTests { } @Test + @Deprecated + @SuppressWarnings("deprecation") void testCustomizeRejectIllegalHeader() { bind("server.tomcat.reject-illegal-header=false"); customizeAndRunServer((server) -> assertThat( From a720f3aa59b70c106c7ce59fba0bdb856129050a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:25:12 +0200 Subject: [PATCH 19/20] Upgrade to UnboundID LDAPSDK 6.0.9 Closes gh-35813 --- 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 c08ad93989..52d9e2b85a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1494,7 +1494,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "6.0.8") { + library("UnboundID LDAPSDK", "6.0.9") { group("com.unboundid") { modules = [ "unboundid-ldapsdk" From ddeee2bcbf861492a353b98ac4d07e1d84630bb6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 9 Jun 2023 15:25:17 +0200 Subject: [PATCH 20/20] Upgrade to Undertow 2.3.7.Final Closes gh-35814 --- 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 52d9e2b85a..b7bbe1c3e2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1501,7 +1501,7 @@ bom { ] } } - library("Undertow", "2.3.6.Final") { + library("Undertow", "2.3.7.Final") { group("io.undertow") { modules = [ "undertow-core",