From a02748a9b99a8c8a937dde4d8c8226bbdb1dee9e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:16:45 -0700 Subject: [PATCH 01/19] Upgrade to Jaybird 5.0.7.java11 Closes gh-45066 --- 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 78c6eced73d..6912c8e94e2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -903,7 +903,7 @@ bom { releaseNotes("https://github.com/jaxen-xpath/jaxen/releases/tag/v{version}") } } - library("Jaybird", "5.0.6.java11") { + library("Jaybird", "5.0.7.java11") { prohibit { endsWith ".java8" because "we use the .java11 version" From 918a55cf3dd69031238411716e0e741910a60966 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:16:49 -0700 Subject: [PATCH 02/19] Upgrade to Jetty 12.0.19 Closes gh-45067 --- 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 6912c8e94e2..d0c2b21e045 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -966,7 +966,7 @@ bom { ] } } - library("Jetty", "12.0.18") { + library("Jetty", "12.0.19") { group("org.eclipse.jetty.ee10") { bom("jetty-ee10-bom") } From 28eca39a01bcb33e61e4a928162b577b2f928c14 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:16:53 -0700 Subject: [PATCH 03/19] Upgrade to jOOQ 3.19.22 Closes gh-45068 --- 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 d0c2b21e045..656d7951569 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -986,7 +986,7 @@ bom { ] } } - library("jOOQ", "3.19.21") { + library("jOOQ", "3.19.22") { group("org.jooq") { modules = [ "jooq", From f0c2cfc4522cf417f42f67d796a96613b0b77b72 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:16:57 -0700 Subject: [PATCH 04/19] Upgrade to Lombok 1.18.38 Closes gh-45069 --- 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 656d7951569..f33f1d58f9c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1210,7 +1210,7 @@ bom { javadoc("https://logback.qos.ch/apidocs/ch.qos.logback.core", "ch.qos.logback") } } - library("Lombok", "1.18.36") { + library("Lombok", "1.18.38") { group("org.projectlombok") { modules = [ "lombok" From 78babb33ffdff692efc413043486ca61f3447d2a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:17:02 -0700 Subject: [PATCH 05/19] Upgrade to MariaDB 3.3.4 Closes gh-45070 --- 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 f33f1d58f9c..63de6ba4ea1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1221,7 +1221,7 @@ bom { javadoc("https://projectlombok.org/api") } } - library("MariaDB", "3.3.3") { + library("MariaDB", "3.3.4") { group("org.mariadb.jdbc") { modules = [ "mariadb-java-client" From 9dc1e3ed40f169e0a8a8c748640ee489dbc1b9e2 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:17:06 -0700 Subject: [PATCH 06/19] Upgrade to Tomcat 10.1.40 Closes gh-45071 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4154ae8ce43..8aa1650edbe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,6 @@ nativeBuildToolsVersion=0.10.6 snakeYamlVersion=2.2 springFrameworkVersion=6.1.18 springFramework60xVersion=6.0.23 -tomcatVersion=10.1.39 +tomcatVersion=10.1.40 kotlin.stdlib.default.dependency=false From 3726d6e3aad5a612b96939e2e9c1291e54b30276 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 10:57:23 -0700 Subject: [PATCH 07/19] Align proxies with defaults from Tomcat 10.1.40 See gh-45071 --- .../boot/autoconfigure/web/ServerProperties.java | 5 ++++- .../web/embedded/TomcatWebServerFactoryCustomizerTests.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 75b742e597a..84df6ddb3f0 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 @@ -1038,7 +1038,10 @@ public class ServerProperties { + "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 - + "0:0:0:0:0:0:0:1|::1"; + + "0:0:0:0:0:0:0:1|" // 0:0:0:0:0:0:0:1 + + "::1|" // ::1 + + "fe[89ab]\\p{XDigit}:.*|" // + + "f[cd]\\p{XDigit}{2}+:.*"; /** * Header that holds the incoming protocol, usually named "X-Forwarded-Proto". 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 f3c1ed49304..5fa37c04b3f 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 @@ -379,7 +379,10 @@ class TomcatWebServerFactoryCustomizerTests { + "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 + "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12 - + "0:0:0:0:0:0:0:1|::1"; + + "0:0:0:0:0:0:0:1|" // 0:0:0:0:0:0:0:1 + + "::1|" // ::1 + + "fe[89ab]\\p{XDigit}:.*|" // + + "f[cd]\\p{XDigit}{2}+:.*"; assertThat(remoteIpValve.getInternalProxies()).isEqualTo(expectedInternalProxies); } From 91e77c5eac3b77b5e543a34246b894d7b56e33a4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:19 -0700 Subject: [PATCH 08/19] Start building against Micrometer 1.13.13 snapshots See gh-45051 --- 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 63de6ba4ea1..ff4a6812b9b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1407,7 +1407,7 @@ bom { releaseNotes("https://github.com/apache/maven-war-plugin/releases/tag/maven-war-plugin-{version}") } } - library("Micrometer", "1.13.12") { + library("Micrometer", "1.13.13-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ From b54369a8e8673f9e28b7a837a1d00d9f4e039750 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:20 -0700 Subject: [PATCH 09/19] Start building against Micrometer Tracing 1.3.11 snapshots See gh-45052 --- 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 ff4a6812b9b..05e41fe45fe 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1429,7 +1429,7 @@ bom { releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}") } } - library("Micrometer Tracing", "1.3.10") { + library("Micrometer Tracing", "1.3.11-SNAPSHOT") { considerSnapshots() group("io.micrometer") { bom("micrometer-tracing-bom") From 252fcc2df008c8980eb13d7a80e2f06120848074 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:20 -0700 Subject: [PATCH 10/19] Start building against Reactor Bom 2023.0.17 snapshots See gh-45053 --- 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 05e41fe45fe..e08904afc10 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1865,7 +1865,7 @@ bom { ] } } - library("Reactor Bom", "2023.0.16") { + library("Reactor Bom", "2023.0.17-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From ee431775a3cdd50db46b6d4bdbf42b695fd5220f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:20 -0700 Subject: [PATCH 11/19] Start building against Spring AMQP 3.1.11 snapshots See gh-45054 --- 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 e08904afc10..2cb76cdb033 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2060,7 +2060,7 @@ bom { ] } } - library("Spring AMQP", "3.1.10") { + library("Spring AMQP", "3.1.11-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { bom("spring-amqp-bom") From 4dee317e9519955deefb37a775f10cee3f34933e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:20 -0700 Subject: [PATCH 12/19] Start building against Spring Authorization Server 1.3.6 snapshots See gh-45055 --- 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 2cb76cdb033..bb91f1c6c61 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2075,7 +2075,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-amqp/releases/tag/v{version}") } } - library("Spring Authorization Server", "1.3.5") { + library("Spring Authorization Server", "1.3.6-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { modules = [ From d65e27ebe82ecad42c45ea00a61254717b6c9f5f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:21 -0700 Subject: [PATCH 13/19] Start building against Spring Data Bom 2024.0.11 snapshots See gh-45056 --- 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 bb91f1c6c61..f29ef05bf08 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2107,7 +2107,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}") } } - library("Spring Data Bom", "2024.0.10") { + library("Spring Data Bom", "2024.0.11-SNAPSHOT") { considerSnapshots() calendarName = "Spring Data Release" group("org.springframework.data") { From 16851121d90ddb3fb9c7decd74d38d192a3019eb Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:21 -0700 Subject: [PATCH 14/19] Start building against Spring Framework 6.1.19 snapshots See gh-45057 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8aa1650edbe..f44be884a62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ mavenVersion=3.9.4 mockitoVersion=5.11.0 nativeBuildToolsVersion=0.10.6 snakeYamlVersion=2.2 -springFrameworkVersion=6.1.18 +springFrameworkVersion=6.1.19-SNAPSHOT springFramework60xVersion=6.0.23 tomcatVersion=10.1.40 From 55c4e80b32cc6f78a00a13cfc5135d52b4624099 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:21 -0700 Subject: [PATCH 15/19] Start building against Spring GraphQL 1.3.5 snapshots See gh-45058 --- 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 f29ef05bf08..a519a469dea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2137,7 +2137,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-framework/releases/tag/v{version}") } } - library("Spring GraphQL", "1.3.4") { + library("Spring GraphQL", "1.3.5-SNAPSHOT") { considerSnapshots() group("org.springframework.graphql") { modules = [ From 699365c593255231bf0ed062a84daaeb5adaac7f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:21 -0700 Subject: [PATCH 16/19] Start building against Spring LDAP 3.2.12 snapshots See gh-45059 --- 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 a519a469dea..30be1763e57 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2205,7 +2205,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-kafka/releases/tag/v{version}") } } - library("Spring LDAP", "3.2.11") { + library("Spring LDAP", "3.2.12-SNAPSHOT") { considerSnapshots() group("org.springframework.ldap") { modules = [ From 1217e65672f785a729b760b94d62dd9dcbde164d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:22 -0700 Subject: [PATCH 17/19] Start building against Spring Security 6.3.9 snapshots See gh-45060 --- 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 30be1763e57..6a6a76e8785 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2268,7 +2268,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-retry/releases/tag/v{version}") } } - library("Spring Security", "6.3.8") { + library("Spring Security", "6.3.9-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { bom("spring-security-bom") From 2a73f068f55c574a9c1bd426128ccba469bf15b5 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:22 -0700 Subject: [PATCH 18/19] Start building against Spring Session 3.3.7 snapshots See gh-45061 --- 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 6a6a76e8785..213d52c35aa 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2283,7 +2283,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-security/releases/tag/{version}") } } - library("Spring Session", "3.3.6") { + library("Spring Session", "3.3.7-SNAPSHOT") { considerSnapshots() prohibit { startsWith(["Apple-", "Bean-", "Corn-", "Dragonfruit-"]) From 5926766ebd3c24e3ff81130570543d94f94fbe80 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 10 Apr 2025 07:18:22 -0700 Subject: [PATCH 19/19] Start building against Spring WS 4.0.13 snapshots See gh-45062 --- 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 213d52c35aa..bc17cd199ef 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -2302,7 +2302,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-session/releases/tag/{version}") } } - library("Spring WS", "4.0.12") { + library("Spring WS", "4.0.13-SNAPSHOT") { considerSnapshots() group("org.springframework.ws") { bom("spring-ws-bom")