From 0eb25c7d3052f8312fc02be00a662e7b085c3a3a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 4 Sep 2026 12:23:49 -0700 Subject: [PATCH] Use module DSL for Jackson Antora attributes Replace custom attributes and processing logic with the module links DSL. See gh-51498 --- .../build/antora/AntoraAsciidocAttributes.java | 5 ----- .../antora/antora-asciidoc-attributes.properties | 10 ---------- platform/spring-boot-dependencies/build.gradle | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 15 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 636d8c87545..572f49c9f0c 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 @@ -114,11 +114,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, "jackson-annotations", "com.fasterxml.jackson.core:jackson-annotations"); - addDependencyVersion(attributes, "jackson-core", "tools.jackson.core:jackson-core"); - addDependencyVersion(attributes, "jackson-databind", "tools.jackson.core:jackson-databind"); - addDependencyVersion(attributes, "jackson-dataformat-xml", "tools.jackson.dataformat:jackson-dataformat-xml"); - addDependencyVersion(attributes, "jackson2-databind", "com.fasterxml.jackson.core:jackson-databind"); addDependencyVersion(attributes, "pulsar-client-api", "org.apache.pulsar:pulsar-client-api"); } 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 e6d581250c7..e6460315f6d 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 @@ -36,20 +36,10 @@ 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-pulsar-client-api-javadoc=https://javadoc.io/doc/org.apache.pulsar/pulsar-client-api/{version-pulsar-client-api} -url-jackson-annotations-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version-jackson-annotations} -url-jackson-core-javadoc=https://javadoc.io/doc/tools.jackson.core/jackson-core/{version-jackson-core} -url-jackson-databind-javadoc=https://javadoc.io/doc/tools.jackson.core/jackson-databind/{version-jackson-databind} -url-jackson-dataformat-xml-javadoc=https://javadoc.io/doc/tools.jackson.dataformat/jackson-dataformat-xml/{version-jackson-dataformat-xml} -url-jackson2-databind-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version-jackson2-databind} # === Javadoc Locations === -javadoc-location-com-fasterxml-jackson-annotation={url-jackson-annotations-javadoc} -javadoc-location-com-fasterxml-jackson-databind={url-jackson2-databind-javadoc} javadoc-location-org-apache-pulsar-client-api={url-pulsar-client-api-javadoc} -javadoc-location-tools-jackson-core={url-jackson-core-javadoc} -javadoc-location-tools-jackson-databind={url-jackson-databind-javadoc} -javadoc-location-tools-jackson-dataformat-xml={url-jackson-dataformat-xml-javadoc} # === API References === diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index 363bd30179d..83e985017d3 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -709,6 +709,9 @@ bom { } links { releaseNotes("https://github.com/FasterXML/jackson/wiki/Jackson-Release-{version}") + module("jackson2-databind", ["jackson-databind"]) { + javadoc("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version}", "com.fasterxml.jackson.databind") + } } } library("Jackson Bom", "${jacksonVersion}") { @@ -719,6 +722,18 @@ bom { } links { releaseNotes("https://github.com/FasterXML/jackson/wiki/Jackson-Release-{version}") + module("jackson-annotations") { + javadoc("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version}", "com.fasterxml.jackson.annotation") + } + module("jackson-core") { + javadoc("https://javadoc.io/doc/tools.jackson.core/jackson-core//{version}", "tools.jackson.core") + } + module("jackson-databind") { + javadoc("https://javadoc.io/doc/tools.jackson.core/jackson-databind/{version}", "tools.jackson.databind") + } + module("jackson-dataformat-xml") { + javadoc("https://javadoc.io/doc/tools.jackson.dataformat/jackson-dataformat-xml//{version}", "tools.jackson.dataformat.xml") + } } } library("Jakarta Activation", "2.1.4") {