From d607b4c226ebd452dee73d1221fdf266ef38fce2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 15 Jun 2026 14:15:36 +0100 Subject: [PATCH 1/4] Remove dependency management for Protobuf Common Protos Boot doesn't interact with the dependency directly so we should not manage its version. Instead, we should allow the version that comes in transitively through gRPC Java to be used instead. Closes gh-50772 --- platform/spring-boot-dependencies/build.gradle | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 4dffef741575..96a9d855c55d 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1915,17 +1915,6 @@ bom { releaseNotes("https://qpid.apache.org/releases/qpid-protonj2-{version}/release-notes.html") } } - library("Protobuf Common Protos", "2.70.0") { - group("com.google.api.grpc") { - modules = [ - "proto-google-common-protos" - ] - } - links { - github("https://github.com/googleapis/sdk-platform-java") - releaseNotes("https://github.com/googleapis/sdk-platform-java/releases/tag/v-{version}") - } - } library("Protobuf Java", "4.34.2") { group("com.google.protobuf") { bom("protobuf-bom") From 4065e767bf45daeeadf8f77e40e28df27e83491f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 15 Jun 2026 14:16:11 +0100 Subject: [PATCH 2/4] Configure Bomr to align gRPC dependency versions with Spring gRPC Closes gh-50769 --- .../springframework/boot/build/bom/Library.java | 3 +++ gradle.properties | 1 + platform/spring-boot-dependencies/build.gradle | 14 +++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java index 0e1b335772da..6140b835ee30 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java @@ -664,6 +664,9 @@ private Library findManagingLibrary() { } private List getBomDependencies(Library manager) { + if (manager == null) { + return Collections.emptyList(); + } return manager.getGroups() .stream() .flatMap((group) -> group.getBoms() diff --git a/gradle.properties b/gradle.properties index fe6d51f268f6..add296dbf695 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,6 +21,7 @@ mockitoVersion=5.23.0 nativeBuildToolsVersion=1.1.1 nullabilityPluginVersion=0.0.11 snakeYamlVersion=2.6 +springGrpcVersion=1.1.0 springFrameworkVersion=7.0.8 springFramework60xVersion=6.0.23 tomcatVersion=11.0.22 diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 96a9d855c55d..1c7338f3645e 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -562,6 +562,12 @@ bom { group("io.grpc") { bom("grpc-bom") } + alignWith { + version { + of "io.grpc:grpc-core" + from "org.springframework.grpc:spring-grpc-core" + } + } links { github("https://github.com/grpc/grpc-java") docs("https://grpc.io/docs/languages/java/") @@ -1919,6 +1925,12 @@ bom { group("com.google.protobuf") { bom("protobuf-bom") } + alignWith { + property { + name "protobuf-java.version" + of "org.springframework.grpc:spring-grpc-dependencies:$springGrpcVersion" + } + } links { site("https://protobuf.dev") github("https://github.com/protocolbuffers/protobuf") @@ -2575,7 +2587,7 @@ bom { releaseNotes("https://github.com/spring-projects/spring-graphql/releases/tag/v{version}") } } - library("Spring gRPC", "1.1.0") { + library("Spring gRPC", "${springGrpcVersion}") { considerSnapshots() group("org.springframework.grpc") { modules = [ From 2cbb5bfb17992d0d17a131cec2dd369b784aee76 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 15 Jun 2026 14:19:30 +0100 Subject: [PATCH 3/4] Upgrade to Protobuf Java 4.35.0 Closes gh-50770 --- 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 1c7338f3645e..cc7d15479c6a 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1921,7 +1921,7 @@ bom { releaseNotes("https://qpid.apache.org/releases/qpid-protonj2-{version}/release-notes.html") } } - library("Protobuf Java", "4.34.2") { + library("Protobuf Java", "4.35.0") { group("com.google.protobuf") { bom("protobuf-bom") } From 699d9c34c3e2ead02b704dc7c1c1d1747684b99b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 15 Jun 2026 14:19:53 +0100 Subject: [PATCH 4/4] Upgrade to Grpc Java 1.81.0 Closes gh-50771 --- 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 cc7d15479c6a..1c069809d033 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -558,7 +558,7 @@ bom { site("https://groovy-lang.org") } } - library("Grpc Java", "1.80.0") { + library("Grpc Java", "1.81.0") { group("io.grpc") { bom("grpc-bom") }