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 4dffef741575..1c069809d033 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -558,10 +558,16 @@ bom { site("https://groovy-lang.org") } } - library("Grpc Java", "1.80.0") { + library("Grpc Java", "1.81.0") { 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/") @@ -1915,21 +1921,16 @@ 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") { + library("Protobuf Java", "4.35.0") { 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") @@ -2586,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 = [