From 310059900579b989498c1aaac83598c8d6b59b87 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 15 Jan 2026 15:33:25 +0000 Subject: [PATCH 1/5] Upgrade to Hibernate 7.2.1.Final Closes gh-48857 --- platform/spring-boot-dependencies/build.gradle | 2 +- .../src/main/java/smoketest/flyway/Person.java | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 058a2c6a958..0e9a5443f89 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -563,7 +563,7 @@ bom { releaseNotes("https://github.com/hazelcast/hazelcast/releases/tag/v{version}") } } - library("Hibernate", "7.2.0.Final") { + library("Hibernate", "7.2.1.Final") { group("org.hibernate.orm") { modules = [ "hibernate-agroal", diff --git a/smoke-test/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java b/smoke-test/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java index ec0a7a712eb..6cea911fc1d 100644 --- a/smoke-test/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java +++ b/smoke-test/spring-boot-smoke-test-flyway/src/main/java/smoketest/flyway/Person.java @@ -16,6 +16,7 @@ package smoketest.flyway; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; @@ -30,23 +31,27 @@ public class Person { @GeneratedValue(generator = "person_generator") private @Nullable Long id; - private @Nullable String firstName; + @Column(nullable = false) + @SuppressWarnings("NullAway.Init") + private String firstName; - private @Nullable String lastName; + @Column(nullable = false) + @SuppressWarnings("NullAway.Init") + private String lastName; - public @Nullable String getFirstName() { + public String getFirstName() { return this.firstName; } - public void setFirstName(@Nullable String firstName) { + public void setFirstName(String firstName) { this.firstName = firstName; } - public @Nullable String getLastName() { + public String getLastName() { return this.lastName; } - public void setLastName(@Nullable String lastname) { + public void setLastName(String lastname) { this.lastName = lastname; } From 0fb395ae1dd386d6058953ea26b29615b7a9bce3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 15 Jan 2026 15:33:30 +0000 Subject: [PATCH 2/5] Upgrade to R2DBC MSSQL 1.0.4.RELEASE Closes gh-48858 --- 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 0e9a5443f89..6c18eda85d8 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1852,7 +1852,7 @@ bom { releaseNotes("https://github.com/mariadb-corporation/mariadb-connector-r2dbc/releases/tag/{version}") } } - library("R2DBC MSSQL", "1.0.3.RELEASE") { + library("R2DBC MSSQL", "1.0.4.RELEASE") { group ("io.r2dbc") { modules = [ "r2dbc-mssql" From 5e9bd08feaafaa74ef128911ba4418411f75d933 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 15 Jan 2026 15:33:31 +0000 Subject: [PATCH 3/5] Upgrade to Spring Framework 7.0.3 Closes gh-48717 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 69c447e7325..feeca63b9d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ mockitoVersion=5.20.0 nativeBuildToolsVersion=0.11.3 nullabilityPluginVersion=0.0.9 snakeYamlVersion=2.5 -springFrameworkVersion=7.0.3-SNAPSHOT +springFrameworkVersion=7.0.3 springFramework60xVersion=6.0.23 tomcatVersion=11.0.15 From 50d3381fb52b83020c22fd367824e38a838430e4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 15 Jan 2026 15:33:31 +0000 Subject: [PATCH 4/5] Upgrade to Spring HATEOAS 3.0.2 Closes gh-48834 --- 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 6c18eda85d8..ead7355cf6b 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2449,7 +2449,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}") } } - library("Spring HATEOAS", "3.0.2-SNAPSHOT") { + library("Spring HATEOAS", "3.0.2") { considerSnapshots() group("org.springframework.hateoas") { modules = [ From 6ba3ac3d7bbfba7c5c14dcd51d5dfdf28655788d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 15 Jan 2026 17:48:38 +0000 Subject: [PATCH 5/5] Upgrade to Lettuce 6.8.2.RELEASE Closes gh-48859 --- 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 ead7355cf6b..2d06231a2bc 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1238,7 +1238,7 @@ bom { releaseNotes("https://github.com/Kotlin/kotlinx.serialization/releases/tag/v{version}") } } - library("Lettuce", "6.8.1.RELEASE") { + library("Lettuce", "6.8.2.RELEASE") { prohibit { contains ".BETA" because "we don't want betas"