Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Phillip Webb
2024-07-25 15:17:00 +01:00
parent e2bd95596d cbd9cd654b
commit e725aa609f
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
antora/package-lock.json generated
View File

@@ -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"
},

2
antora/package.json
View File

@@ -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"

1
buildSrc/src/main/java/org/springframework/boot/build/antora/Extensions.java
View File

@@ -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);

2
buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-playbook-template.yml
View File

@@ -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: ''

2
buildSrc/src/test/resources/org/springframework/boot/build/antora/expected-playbook.yml
View File

@@ -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: ''