From fc997f67d978ba48a2407b62bbdcaa9565de2e58 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sun, 28 Jun 2026 18:04:36 +0100 Subject: [PATCH 1/2] Revert "Pin Antora's Node version to 24.14.1" This reverts commit cf2ca419eaf1b62063c3c6cc4b7f867b43ef17fd. Closes gh-50879 --- .../org/springframework/boot/build/AntoraConventions.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java index 62179875da55..d70e636b3cf3 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java @@ -25,7 +25,6 @@ import java.util.Map; import com.github.gradle.node.NodeExtension; -import com.github.gradle.node.NodePlugin; import com.github.gradle.node.npm.task.NpmInstallTask; import io.spring.gradle.antora.GenerateAntoraYmlPlugin; import io.spring.gradle.antora.GenerateAntoraYmlTask; @@ -121,9 +120,6 @@ private void apply(Project project, AntoraPlugin antoraPlugin) { }); checkAntoraJavadocMacros.configure((macrosTask) -> macrosTask.setClasspath(javadocMacros)); }); - project.getPlugins() - .withType(NodePlugin.class, - (node) -> project.getExtensions().getByType(NodeExtension.class).getVersion().set("24.14.1")); } private void configureGenerateAntoraPlaybookTask(Project project, From b140c8d0fa4765e0be83d478c58614e1ad94dd80 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sun, 28 Jun 2026 18:18:39 +0100 Subject: [PATCH 2/2] Align docs with changes to Gradle gRPC configuration Closes gh-50822 --- .../docs/antora/modules/reference/pages/io/grpc.adoc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/grpc.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/grpc.adoc index 466933a3a9ac..e65b15df1974 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/grpc.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/grpc.adoc @@ -161,12 +161,16 @@ ifeval::["{build-and-artifact-release-type}" == "opensource-snapshot"] maven { url 'https://repo.spring.io/snapshot' } endif::[] } ----- -Since this Gradle file uses both the `org.springframework.boot` and `com.google.protobuf` plugins, you'll get the following: +protobuf { + plugins { + grpc {} + } +} +---- -* Configuration of the `protoc` version. -* Configuration of the `protoc-gen-grpc-java` version. +The `org.springframework.boot` reacts to the `com.google.protobuf` plugin and configures `protoc` and its version. +Additionally, because the `protobuf` extension has been configured to use the `grpc` plugin, the `org.springframework.boot` plugin also configures `protoc-gen-grpc-java` and its version. The `.proto` files should be added to `src/main/proto`.