Merge branch '3.3.x'

spring-projects · Jul 25, 2024 · e725aa6 · e725aa6
2 parents e2bd955 + cbd9cd6
commit e725aa6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/antora/package-lock.json b/antora/package-lock.json
diff --git 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"

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
@@ -52,6 +52,7 @@ public final class Extensions {
 		List<Extension> 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/...Src/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml b/...Src/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml
@@ -9,13 +9,15 @@ 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: '@'
   extensions:
     - '@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
@@ -31,13 +31,15 @@ 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: '@'
   extensions:
   - '@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: ''