From 4065e767bf45daeeadf8f77e40e28df27e83491f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <andy.wilkinson@broadcom.com>
Date: Mon, 15 Jun 2026 14:16:11 +0100
Subject: [PATCH] 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 0e1b335772d..6140b835ee3 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 @@ public class Library {
 		}
 
 		private List<Dependency> 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 fe6d51f268f..add296dbf69 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 96a9d855c55..1c7338f3645 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 = [