From e3cc95f6ab34d43eaf350ce4296de01c5dad4b95 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 25 Jul 2024 11:14:40 +0100 Subject: [PATCH 1/2] Upgrade to springio/asciidoctor-extensions 1.0.0-alpha.11 --- antora/package-lock.json | 8 ++++---- antora/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/antora/package-lock.json b/antora/package-lock.json index c3d2ead92458..b4ad002f6654 100644 --- a/antora/package-lock.json +++ b/antora/package-lock.json @@ -12,7 +12,7 @@ "@springio/antora-extensions": "1.11.1", "@springio/antora-xref-extension": "1.0.0-alpha.3", "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8", - "@springio/asciidoctor-extensions": "1.0.0-alpha.10" + "@springio/asciidoctor-extensions": "1.0.0-alpha.11" } }, "node_modules/@antora/asciidoc-loader": { @@ -386,9 +386,9 @@ } }, "node_modules/@springio/asciidoctor-extensions": { - "version": "1.0.0-alpha.10", - "resolved": "https://registry.npmjs.org/@springio/asciidoctor-extensions/-/asciidoctor-extensions-1.0.0-alpha.10.tgz", - "integrity": "sha512-3+LYhKYsTZKlUq3M99L5W67x+wI6TGlFkD23ZcjKP6undjy3xf7xZL7Ndmslf8trQ24V+QkaCmFtF/2JQY9KwA==", + "version": "1.0.0-alpha.11", + "resolved": "https://registry.npmjs.org/@springio/asciidoctor-extensions/-/asciidoctor-extensions-1.0.0-alpha.11.tgz", + "integrity": "sha512-U+uTAdlqv1qT66iI6M3xHUgJMLl3KxoduiNjhpUGDzLC1PBuApp//BOPF7vWyJT9IGO9pmrQ0Moeucs5xvovQg==", "dependencies": { "js-yaml": "~4.1" }, diff --git a/antora/package.json b/antora/package.json index f7aa971cd360..ea8a2b4af854 100644 --- a/antora/package.json +++ b/antora/package.json @@ -10,7 +10,7 @@ "@springio/antora-xref-extension": "1.0.0-alpha.3", "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8", "@asciidoctor/tabs": "1.0.0-beta.6", - "@springio/asciidoctor-extensions": "1.0.0-alpha.10" + "@springio/asciidoctor-extensions": "1.0.0-alpha.11" }, "config": { "ui-bundle-url": "https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip" From cbd9cd654b0012dadd1c01d9e9839588bab28dc1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 25 Jul 2024 11:11:02 +0100 Subject: [PATCH 2/2] Add @springio/asciidoctor-extensions/javadoc-extension See gh-41605 --- .../java/org/springframework/boot/build/antora/Extensions.java | 1 + .../boot/build/antora/antora-playbook-template.yml | 2 ++ .../org/springframework/boot/build/antora/expected-playbook.yml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java b/buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java index 8234edfea98a..4f38141a5d3f 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java @@ -52,6 +52,7 @@ public final class Extensions { List extensions = new ArrayList<>(); extensions.add(new Extension("@asciidoctor/tabs")); extensions.add(new Extension("@springio/asciidoctor-extensions", "@springio/asciidoctor-extensions", + "@springio/asciidoctor-extensions/javadoc-extension", "@springio/asciidoctor-extensions/configuration-properties-extension", "@springio/asciidoctor-extensions/section-ids-extension")); asciidoc = List.copyOf(extensions); diff --git a/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml b/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml index 6960bc197928..27da2d48d362 100644 --- a/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml +++ b/buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml @@ -9,6 +9,7 @@ asciidoc: attributes: chomp: all hide-uri-scheme: '@' + javadoc-location: xref:api:java/ page-pagination: '' page-stackoverflow-url: https://stackoverflow.com/tags/spring-boot tabs-sync-option: '@' @@ -16,6 +17,7 @@ asciidoc: - '@asciidoctor/tabs' - '@springio/asciidoctor-extensions' - '@springio/asciidoctor-extensions/configuration-properties-extension' + - '@springio/asciidoctor-extensions/javadoc-extension' - '@springio/asciidoctor-extensions/section-ids-extension' urls: latest_version_segment: '' diff --git a/buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml b/buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml index 5f7f86a73d8a..340924854f52 100644 --- a/buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml +++ b/buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml @@ -31,6 +31,7 @@ asciidoc: attributes: chomp: all hide-uri-scheme: '@' + javadoc-location: xref:api:java/ page-pagination: '' page-stackoverflow-url: https://stackoverflow.com/tags/spring-boot tabs-sync-option: '@' @@ -38,6 +39,7 @@ asciidoc: - '@asciidoctor/tabs' - '@springio/asciidoctor-extensions' - '@springio/asciidoctor-extensions/configuration-properties-extension' + - '@springio/asciidoctor-extensions/javadoc-extension' - '@springio/asciidoctor-extensions/section-ids-extension' urls: latest_version_segment: ''