From 44629669e248026edc080d9a5e06f0d86b1cf96a Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Wed, 27 May 2026 11:55:01 +0200 Subject: [PATCH 01/37] Disable Homebrew sandbox for the verification tests --- .github/workflows/verify.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 644c8b642689..a31b4a93e970 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -76,6 +76,7 @@ jobs: RVT_RELEASE_TYPE: ${{ vars.COMMERCIAL && 'commercial' || 'oss' }} RVT_STAGING: ${{ inputs.staging }} RVT_VERSION: ${{ inputs.version }} + HOMEBREW_NO_SANDBOX_LINUX: "1" run: ./gradlew spring-boot-release-verification-tests:test - name: Upload Build Reports on Failure if: failure() From f2b69df77e28e85e536aac132d0be42079373ffa Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:17 +0100 Subject: [PATCH 02/37] Start building against Micrometer 1.17.0 snapshots See gh-50559 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index cc522f4eba99..490c6061b7a1 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1613,7 +1613,7 @@ bom { releaseNotes("https://github.com/apache/maven-war-plugin/releases/tag/maven-war-plugin-{version}") } } - library("Micrometer", "1.17.0-RC1") { + library("Micrometer", "1.17.0-SNAPSHOT") { considerSnapshots() group("io.micrometer") { modules = [ From 8dfe2970895b4085f133ec399dba4d67e92d8b88 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:21 +0100 Subject: [PATCH 03/37] Start building against Micrometer Tracing 1.7.0 snapshots See gh-50560 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 490c6061b7a1..ce1e2fac9845 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1636,7 +1636,7 @@ bom { releaseNotes("https://github.com/micrometer-metrics/micrometer/releases/tag/v{version}") } } - library("Micrometer Tracing", "1.7.0-RC1") { + library("Micrometer Tracing", "1.7.0-SNAPSHOT") { considerSnapshots() group("io.micrometer") { bom("micrometer-tracing-bom") From 77baefba8dfd68ba4ab789e53b9b04deed77fd02 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:26 +0100 Subject: [PATCH 04/37] Start building against Reactor Bom 2025.0.6 snapshots See gh-50561 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index ce1e2fac9845..87c7a3e633a2 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2081,7 +2081,7 @@ bom { ] } } - library("Reactor Bom", "2025.0.5") { + library("Reactor Bom", "2025.0.6-SNAPSHOT") { considerSnapshots() calendarName = "Reactor" group("io.projectreactor") { From 2fb8eefcafc4a5bd154ec0f9125e390ccae0eeaf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:30 +0100 Subject: [PATCH 05/37] Start building against Spring AMQP 4.1.0 snapshots See gh-50562 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 87c7a3e633a2..24860b117c41 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2512,7 +2512,7 @@ bom { ] } } - library("Spring AMQP", "4.1.0-RC1") { + library("Spring AMQP", "4.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.amqp") { bom("spring-amqp-bom") From 2e7679a9aeeded4eb48a2d63861fe105625f5dfc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:35 +0100 Subject: [PATCH 06/37] Start building against Spring Batch 6.0.4 snapshots See gh-50563 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 24860b117c41..74c76aca2235 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2527,7 +2527,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-amqp/releases/tag/v{version}") } } - library("Spring Batch", "6.0.3") { + library("Spring Batch", "6.0.4-SNAPSHOT") { considerSnapshots() group("org.springframework.batch") { bom("spring-batch-bom") From 6ccca4a5f13cbe120954167ef9150d93526d01d9 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:40 +0100 Subject: [PATCH 07/37] Start building against Spring Data Bom 2026.0.0 snapshots See gh-50564 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 74c76aca2235..42885462e20d 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2542,7 +2542,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}") } } - library("Spring Data Bom", "2026.0.0-RC1") { + library("Spring Data Bom", "2026.0.0-SNAPSHOT") { considerSnapshots() calendarName = "Spring Data Release" group("org.springframework.data") { From 92a904b70d8cc243cc3647a7f82ff8b90fd6286c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:44 +0100 Subject: [PATCH 08/37] Start building against Spring Framework 7.0.8 snapshots See gh-50565 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3d2d78d6aa5c..83b6b51438de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ mockitoVersion=5.23.0 nativeBuildToolsVersion=1.1.0 nullabilityPluginVersion=0.0.11 snakeYamlVersion=2.6 -springFrameworkVersion=7.0.7 +springFrameworkVersion=7.0.8-SNAPSHOT springFramework60xVersion=6.0.23 tomcatVersion=11.0.22 protobufGradlePluginVersion=0.9.6 From b5d4540cceb3fd1777c2f172cdc1ebdf338e2d51 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:49 +0100 Subject: [PATCH 09/37] Start building against Spring gRPC 1.1.0 snapshots See gh-50566 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 42885462e20d..8139ee33d8f0 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2590,7 +2590,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}") } } - library("Spring gRPC", "1.1.0-RC1") { + library("Spring gRPC", "1.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.grpc") { modules = [ From 1883d162cab165d3d593cd7d317406839feb8704 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:53 +0100 Subject: [PATCH 10/37] Start building against Spring HATEOAS 3.1.0 snapshots See gh-50567 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 8139ee33d8f0..6eb221bd8168 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2607,7 +2607,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-grpc/releases/tag/v{version}") } } - library("Spring HATEOAS", "3.1.0-RC1") { + library("Spring HATEOAS", "3.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.hateoas") { modules = [ From 61e477aac54bd7ef6604b2a2ae929548a38efd80 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:11:57 +0100 Subject: [PATCH 11/37] Start building against Spring Integration 7.1.0 snapshots See gh-50568 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 6eb221bd8168..0961038ba9d2 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2624,7 +2624,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-hateoas/releases/tag/{version}") } } - library("Spring Integration", "7.1.0-RC1") { + library("Spring Integration", "7.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.integration") { bom("spring-integration-bom") From d50d40aff91f004690e6e8b5f902f8fa33bac4db Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:02 +0100 Subject: [PATCH 12/37] Start building against Spring Kafka 4.1.0 snapshots See gh-50569 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 0961038ba9d2..b02dc01a5a79 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2639,7 +2639,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-integration/releases/tag/v{version}") } } - library("Spring Kafka", "4.1.0-RC1") { + library("Spring Kafka", "4.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.kafka") { modules = [ From 8262f4b7b8e7babca3972a038e73396cc973151a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:07 +0100 Subject: [PATCH 13/37] Start building against Spring LDAP 4.1.0 snapshots See gh-50570 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index b02dc01a5a79..ff38bbe83a7a 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2657,7 +2657,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-kafka/releases/tag/v{version}") } } - library("Spring LDAP", "4.1.0-RC1") { + library("Spring LDAP", "4.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.ldap") { modules = [ From 21c3cfbac4c93e5da2ef05015bbdddd00b59ff09 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:11 +0100 Subject: [PATCH 14/37] Start building against Spring Pulsar 2.0.6 snapshots See gh-50571 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index ff38bbe83a7a..9dbb0c3c438c 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2677,7 +2677,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-ldap/releases/tag/{version}") } } - library("Spring Pulsar", "2.0.5") { + library("Spring Pulsar", "2.0.6-SNAPSHOT") { considerSnapshots() group("org.springframework.pulsar") { bom("spring-pulsar-bom") From 297c4826b54cd958451ebdc527b067725f431e25 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:16 +0100 Subject: [PATCH 15/37] Start building against Spring RESTDocs 4.0.1 snapshots See gh-50572 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 9dbb0c3c438c..43de1af7189c 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2692,7 +2692,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-pulsar/releases/tag/v{version}") } } - library("Spring RESTDocs", "4.0.0") { + library("Spring RESTDocs", "4.0.1-SNAPSHOT") { considerSnapshots() group("org.springframework.restdocs") { bom("spring-restdocs-bom") From ad74de496fc807c31af821e2c70d611052abc496 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:20 +0100 Subject: [PATCH 16/37] Start building against Spring Security 7.1.0 snapshots See gh-50573 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 43de1af7189c..158accac4b7f 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2707,7 +2707,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-restdocs/releases/tag/v{version}") } } - library("Spring Security", "7.1.0-RC1") { + library("Spring Security", "7.1.0-SNAPSHOT") { considerSnapshots() group("org.springframework.security") { bom("spring-security-bom") From 3ed2cccc92558eb850cd7f2afc325298762ec7bf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:25 +0100 Subject: [PATCH 17/37] Start building against Spring Session 4.1.0 snapshots See gh-50574 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 158accac4b7f..8f2a46c70690 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2722,7 +2722,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-security/releases/tag/{version}") } } - library("Spring Session", "4.1.0-RC1") { + library("Spring Session", "4.1.0-SNAPSHOT") { considerSnapshots() prohibit { startsWith(["Apple-", "Bean-", "Corn-", "Dragonfruit-"]) From f0afce6abb0d6a0749690bfa45d385097b6961a3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:12:30 +0100 Subject: [PATCH 18/37] Start building against Spring WS 5.0.2 snapshots See gh-50575 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 8f2a46c70690..f7b3eba2acd6 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2745,7 +2745,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-session/releases/tag/{version}") } } - library("Spring WS", "5.0.1") { + library("Spring WS", "5.0.2-SNAPSHOT") { considerSnapshots() group("org.springframework.ws") { bom("spring-ws-bom") From e30ab205aa31f74a09435e1b5ca21e62dd0a29a8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:00 +0100 Subject: [PATCH 19/37] Upgrade to Couchbase Client 3.11.3 Closes gh-50576 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index f7b3eba2acd6..785903218a36 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -312,7 +312,7 @@ bom { site("https://commons.apache.org/proper/commons-pool") } } - library("Couchbase Client", "3.11.2") { + library("Couchbase Client", "3.11.3") { group("com.couchbase.client") { modules = [ "java-client" From fb6be88593f786343449eb19b14afc638392881f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:05 +0100 Subject: [PATCH 20/37] Upgrade to Elasticsearch Client 9.4.1 Closes gh-50577 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 785903218a36..b2b6258a8008 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -401,7 +401,7 @@ bom { releaseNotes("https://github.com/ehcache/ehcache3/releases/tag/v{version}") } } - library("Elasticsearch Client", "9.3.4") { + library("Elasticsearch Client", "9.4.1") { prohibit { contains "-alpha" contains "-beta" From 41dbadeb6b7ba403f5631248d0e54d5d8e242ee1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:12 +0100 Subject: [PATCH 21/37] Upgrade to Hibernate 7.4.0.Final Closes gh-50578 --- .../metrics/HibernateMetricsAutoConfiguration.java | 2 +- platform/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java index 3951ad2bb0e6..a46d76f75000 100644 --- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java +++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/autoconfigure/metrics/HibernateMetricsAutoConfiguration.java @@ -23,7 +23,7 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.PersistenceException; import org.hibernate.SessionFactory; -import org.hibernate.stat.HibernateMetrics; +import org.hibernate.orm.micrometer.HibernateMetrics; import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index b2b6258a8008..b4499a4f32a6 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -635,7 +635,7 @@ bom { releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}") } } - library("Hibernate", "7.3.4.Final") { + library("Hibernate", "7.4.0.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", From 03a9977cd936928d3f87de95fd540aaad4ecd8d6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:16 +0100 Subject: [PATCH 22/37] Upgrade to Jaxen 2.0.3 Closes gh-50579 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index b4499a4f32a6..91500666b59a 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1035,7 +1035,7 @@ bom { ] } } - library("Jaxen", "2.0.1") { + library("Jaxen", "2.0.3") { group("jaxen") { modules = [ "jaxen" From e57aebdfbbec151ee805718fe4fa301232ffb31e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:22 +0100 Subject: [PATCH 23/37] Upgrade to jOOQ 3.21.4 Closes gh-50580 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 91500666b59a..2cf0124a6451 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1143,7 +1143,7 @@ bom { ] } } - library("jOOQ", "3.21.3") { + library("jOOQ", "3.21.4") { group("org.jooq") { bom("jooq-bom") plugins = [ From 622bfaed69bcd8c20df695446c4dd409bbc776b4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:27 +0100 Subject: [PATCH 24/37] Upgrade to Lettuce 7.5.2.RELEASE Closes gh-50581 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 2cf0124a6451..840b52f020cd 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1316,7 +1316,7 @@ bom { releaseNotes("https://github.com/Kotlin/kotlinx.serialization/releases/tag/v{version}") } } - library("Lettuce", "7.5.1.RELEASE") { + library("Lettuce", "7.5.2.RELEASE") { prohibit { contains ".BETA" because "we don't want betas" From 99fc624a4b47753d8cc98efa447b53fe3436959b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:31 +0100 Subject: [PATCH 25/37] Upgrade to Liquibase 5.0.3 Closes gh-50582 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 840b52f020cd..467ef70f970c 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1340,7 +1340,7 @@ bom { releaseNotes("https://github.com/redis/lettuce/releases/tag/{version}") } } - library("Liquibase", "5.0.2") { + library("Liquibase", "5.0.3") { group("org.liquibase") { modules = [ "liquibase-cdi", From 7a9ab3e782d8778c1dba2dc6a1f2eaacee72dc8f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:36 +0100 Subject: [PATCH 26/37] Upgrade to Maven Enforcer Plugin 3.6.3 Closes gh-50583 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 467ef70f970c..e105096b0b0d 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1480,7 +1480,7 @@ bom { releaseNotes("https://github.com/apache/maven-deploy-plugin/releases/tag/maven-deploy-plugin-{version}") } } - library("Maven Enforcer Plugin", "3.6.2") { + library("Maven Enforcer Plugin", "3.6.3") { group("org.apache.maven.plugins") { plugins = [ "maven-enforcer-plugin" From dcb928eea04005c1d07b9afdef730b1acf42f87c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:40 +0100 Subject: [PATCH 27/37] Upgrade to MongoDB 5.7.0 Closes gh-50584 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index e105096b0b0d..9f7888b53646 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1658,7 +1658,7 @@ bom { releaseNotes("https://github.com/mockito/mockito/releases/tag/v{version}") } } - library("MongoDB", "5.7.0-beta1") { + library("MongoDB", "5.7.0") { alignWith { version { of "org.mongodb:mongodb-driver-core" From ded06ef964b2ac2ac66be376bebb2f029e7406fd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:44 +0100 Subject: [PATCH 28/37] Upgrade to Native Build Tools Plugin 1.1.1 Closes gh-50585 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 83b6b51438de..30aa3f0a755a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ junitJupiterVersion=6.0.3 kotlinVersion=2.3.21 mavenVersion=3.9.13 mockitoVersion=5.23.0 -nativeBuildToolsVersion=1.1.0 +nativeBuildToolsVersion=1.1.1 nullabilityPluginVersion=0.0.11 snakeYamlVersion=2.6 springFrameworkVersion=7.0.8-SNAPSHOT From b100dbd5a2b06ecd9033fbfaa02ebf0778382e82 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:49 +0100 Subject: [PATCH 29/37] Upgrade to Neo4j Java Driver 6.1.0 Closes gh-50586 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 9f7888b53646..3de0adaf04cf 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1729,7 +1729,7 @@ bom { ] } } - library("Neo4j Java Driver", "6.0.5") { + library("Neo4j Java Driver", "6.1.0") { alignWith { version { of "org.neo4j.driver:neo4j-java-driver" From 300e3026f094d2f14a22a10cc184c82f3076bb60 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:19:55 +0100 Subject: [PATCH 30/37] Upgrade to Netty 4.2.14.Final Closes gh-50587 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 3de0adaf04cf..debbc415e43c 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1752,7 +1752,7 @@ bom { releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}") } } - library("Netty", "4.2.13.Final") { + library("Netty", "4.2.14.Final") { prohibit { contains ".Alpha" contains ".Beta" From 169442fd2f7eed856a0534d523f2c02f625acf2c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:20:00 +0100 Subject: [PATCH 31/37] Upgrade to OpenTelemetry 1.62.0 Closes gh-50588 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index debbc415e43c..7ff8076ac90e 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1768,7 +1768,7 @@ bom { releaseNotes("https://github.com/netty/netty/releases/tag/netty-{version}") } } - library("OpenTelemetry", "1.60.1") { + library("OpenTelemetry", "1.62.0") { group("io.opentelemetry") { bom("opentelemetry-bom") } From f6ff1f43a2ce07876831d3c8a2e22ee01ff33c2c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:20:05 +0100 Subject: [PATCH 32/37] Upgrade to Protobuf Maven Plugin 5.1.4 Closes gh-50589 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 7ff8076ac90e..a96784308926 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1842,7 +1842,7 @@ bom { releaseNotes("https://github.com/oracle/oracle-r2dbc/releases/tag/{version}") } } - library("Protobuf Maven Plugin", "5.1.3") { + library("Protobuf Maven Plugin", "5.1.4") { group("io.github.ascopes") { plugins = [ "protobuf-maven-plugin" From 5a9bf446f2eb8bc33cdbaaed3cc4be0a7730c3d2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:20:09 +0100 Subject: [PATCH 33/37] Upgrade to Protobuf Java 4.34.2 Closes gh-50590 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index a96784308926..3fdf896331df 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1930,7 +1930,7 @@ bom { releaseNotes("https://github.com/googleapis/sdk-platform-java/releases/tag/v-{version}") } } - library("Protobuf Java", "4.34.1") { + library("Protobuf Java", "4.34.2") { group("com.google.protobuf") { bom("protobuf-bom") } From a23febf3faf81096892bc4bdb6a10a32bd3bd07d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:20:14 +0100 Subject: [PATCH 34/37] Upgrade to SLF4J 2.0.18 Closes gh-50591 --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 3fdf896331df..e17fb68e0d78 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2484,7 +2484,7 @@ bom { releaseNotes("https://github.com/sendgrid/sendgrid-java/releases/tag/{version}") } } - library("SLF4J", "2.0.17") { + library("SLF4J", "2.0.18") { prohibit { contains "-alpha" because "we don't want alphas" From dcf7f15e1d88c7d7dcd451e6ac2e61370f35e53f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 12:20:54 +0100 Subject: [PATCH 35/37] Change upgrade policy to same-minor-version --- platform/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index e17fb68e0d78..6024148fe40b 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -23,7 +23,7 @@ description = "Spring Boot Dependencies" bom { upgrade { - policy = "same-major-version" + policy = "same-minor-version" gitHub { issueLabels = [ "type: dependency-upgrade", From a573e121fb364cefda1ab401f343c4bbc128a422 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 14:10:20 +0100 Subject: [PATCH 36/37] fixup! Upgrade to Hibernate 7.4.0.Final --- .../org/springframework/boot/hibernate/SpringJtaPlatform.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java index 6342a1073184..ef824e3a6684 100644 --- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java +++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java @@ -45,11 +45,13 @@ public SpringJtaPlatform(JtaTransactionManager transactionManager) { } @Override + @SuppressWarnings("NullAway") protected @Nullable TransactionManager locateTransactionManager() { return this.transactionManager.getTransactionManager(); } @Override + @SuppressWarnings("NullAway") protected @Nullable UserTransaction locateUserTransaction() { return this.transactionManager.getUserTransaction(); } From d6a23b72b887afd68e9a7097db1c004a65a06e90 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 27 May 2026 14:10:27 +0100 Subject: [PATCH 37/37] Deprecate SpringJtaPlatform This deprecation should have happened as part of c54d05c for #48969. Closes gh-50592 --- .../springframework/boot/hibernate/SpringJtaPlatform.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java index ef824e3a6684..36ed1fe2df60 100644 --- a/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java +++ b/module/spring-boot-hibernate/src/main/java/org/springframework/boot/hibernate/SpringJtaPlatform.java @@ -21,6 +21,7 @@ import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; import org.jspecify.annotations.Nullable; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.util.Assert; @@ -32,7 +33,11 @@ * @author Josh Long * @author Phillip Webb * @since 4.0.0 + * @deprecated since 4.1.0 for removal in 4.3.0 in favor of @link + * {@link HibernateJpaVendorAdapter#setJtaTransactionManager(Object)} and + * {@link org.springframework.orm.jpa.hibernate.ConfigurableJtaPlatform} */ +@Deprecated(since = "4.1.0", forRemoval = true) public class SpringJtaPlatform extends AbstractJtaPlatform { private static final long serialVersionUID = 1L;