From 4b2c0d2852752bb8abeb6ba8e4dc2beef081ab15 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 4 Sep 2026 13:21:38 -0700 Subject: [PATCH] Use module DSL for Pulsar Antora attributes Replace custom attributes and processing logic with the module links DSL. See gh-51498 --- .../build/antora/AntoraAsciidocAttributes.java | 15 --------------- .../antora/antora-asciidoc-attributes.properties | 5 ----- platform/spring-boot-dependencies/build.gradle | 3 +++ 3 files changed, 3 insertions(+), 20 deletions(-) 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 572f49c9f0c..636093a33b8 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(); } @@ -114,7 +110,6 @@ public class AntoraAsciidocAttributes { this.libraries.forEach((library) -> addVersionAttributes(attributes, library)); attributes.put("version-native-build-tools", (String) this.projectProperties.get("nativeBuildToolsVersion")); attributes.put("version-graal", (String) this.projectProperties.get("graalVersion")); - addDependencyVersion(attributes, "pulsar-client-api", "org.apache.pulsar:pulsar-client-api"); } private void addVersionAttributes(Map attributes, Library library) { @@ -126,16 +121,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 e6460315f6d..891b0fe76c6 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 @@ -35,11 +35,6 @@ url-native-build-tools-docs-gradle-plugin={url-native-build-tools-docs}/gradle-p url-native-build-tools-docs-maven-plugin={url-native-build-tools-docs}/maven-plugin.html url-paketo-docs=https://paketo.io/docs url-paketo-docs-java-buildpack={url-paketo-docs}/buildpacks/language-family-buildpacks/java -url-pulsar-client-api-javadoc=https://javadoc.io/doc/org.apache.pulsar/pulsar-client-api/{version-pulsar-client-api} - -# === Javadoc Locations === - -javadoc-location-org-apache-pulsar-client-api={url-pulsar-client-api-javadoc} # === API References === diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 83e985017d3..78a40b9f345 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1885,6 +1885,9 @@ bom { docs(version -> "https://pulsar.apache.org/docs/%s.%s.x" .formatted(version.major(), version.minor())) releaseNotes("https://pulsar.apache.org/release-notes/versioned/pulsar-{version}") + module("pulsar-client-api") { + javadoc("https://javadoc.io/doc/org.apache.pulsar/pulsar-client-api/{version}", "org.apache.pulsar.client.api") + } } } library("Quartz", "2.5.2") {