diff --git a/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java b/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java index 54a0a50ef0c..e791b422071 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java @@ -37,7 +37,6 @@ import org.springframework.boot.build.bom.ResolvedBom; import org.springframework.boot.build.bom.ResolvedBom.ResolvedLibrary; import org.springframework.boot.build.properties.BuildProperties; import org.springframework.boot.build.properties.BuildType; -import org.springframework.util.Assert; /** * Generates Asciidoctor attributes for use with Antora. @@ -60,8 +59,6 @@ public class AntoraAsciidocAttributes { private final ResolvedBom resolvedBom; - private final Map dependencyVersions; - private final Map projectProperties; public AntoraAsciidocAttributes(Project project, BomExtension dependencyBom, ResolvedBom resolvedBom) { @@ -71,7 +68,6 @@ public class AntoraAsciidocAttributes { this.artifactRelease = ArtifactRelease.forProject(project); this.libraries = dependencyBom.getLibraries(); this.resolvedBom = resolvedBom; - this.dependencyVersions = resolvedBom.dependencyVersions(); this.projectProperties = project.getProperties(); } @@ -116,7 +112,6 @@ public class AntoraAsciidocAttributes { attributes.put("version-graal", (String) this.projectProperties.get("graalVersion")); attributes.put("version-protobuf-gradle-plugin", (String) this.projectProperties.get("protobufGradlePluginVersion")); - addDependencyVersion(attributes, "grpc-api", "io.grpc:grpc-api"); } private void addVersionAttributes(Map attributes, Library library) { @@ -128,16 +123,6 @@ public class AntoraAsciidocAttributes { }); } - private void addDependencyVersion(Map attributes, String name, String groupAndArtifactId) { - attributes.put("version-" + name, getVersion(groupAndArtifactId)); - } - - private String getVersion(String groupAndArtifactId) { - String version = this.dependencyVersions.get(groupAndArtifactId); - Assert.notNull(version, () -> "No version found for " + groupAndArtifactId); - return version; - } - private void addArtifactAttributes(Map attributes) { attributes.put("url-artifact-repository", this.artifactRelease.getDownloadRepo()); attributes.put("artifact-release-type", this.artifactRelease.getType()); diff --git a/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties b/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties index f76ead0b88a..603f5f0bc75 100644 --- a/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties +++ b/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties @@ -37,11 +37,6 @@ url-native-build-tools-docs-maven-plugin={url-native-build-tools-docs}/maven-plu url-paketo-docs=https://paketo.io/docs url-paketo-docs-java-buildpack={url-paketo-docs}/buildpacks/language-family-buildpacks/java url-protobuf-docs-gradle-plugin=https://github.com/google/protobuf-gradle-plugin -https://javadoc.io/doc/io.grpc/grpc-api/latest/io/grpc/package-summary.html - -# === Javadoc Locations === - -javadoc-location-io-grpc={url-grpc-api-javadoc} # === API References === diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 5f14bb7ba8f..f2d318e6601 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -574,6 +574,9 @@ bom { github("https://github.com/grpc/grpc-java") docs("https://grpc.io/docs/languages/java/") releaseNotes("https://github.com/grpc/grpc-java/releases/tag/v{version}") + module("grpc-api") { + javadoc("https://javadoc.io/doc/io.grpc/grpc-api/{version}", "io.grpc") + } } } library("Grpc Kotlin", "1.5.0") {