Skip to content

Commit

Permalink
Upgrading antora ui package and use package.json
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanjbaxter committed Jun 18, 2024
1 parent 9b92ef3 commit 1f4c1c3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ _configprops.adoc
_spans.adoc
_metrics.adoc
_conventions.adoc
package.json
package-lock.json
/package.json
package-lock.json
11 changes: 2 additions & 9 deletions docs/antora-playbook.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
antora:
extensions:
- '@springio/antora-extensions/partial-build-extension'
# atlas-extension must be before latest-version-extension so latest versions are applied to imported versions
- '@antora/atlas-extension'
- require: '@springio/antora-extensions/latest-version-extension'
- require: '@springio/antora-extensions/inject-collector-cache-config-extension'
- '@antora/collector-extension'
- require: '@springio/antora-extensions/root-component-extension'
- require: '@springio/antora-extensions'
root_component_name: 'cloud-build'
- '@springio/antora-extensions/static-page-extension'
site:
title: Spring Cloud Build
url: https://docs.spring.io/spring-cloud-build/reference/
Expand Down Expand Up @@ -37,4 +30,4 @@ runtime:
format: pretty
ui:
bundle:
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/ui-bundle.zip
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip
10 changes: 10 additions & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"dependencies": {
"antora": "3.2.0-alpha.4",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.0-alpha.3",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.11.1",
"@springio/asciidoctor-extensions": "1.0.0-alpha.10"
}
}
2 changes: 1 addition & 1 deletion docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<artifactId>antora-component-version-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>io.spring.maven.antora</groupId>
<groupId>org.antora</groupId>
<artifactId>antora-maven-plugin</artifactId>
</plugin>
<plugin>
Expand Down
13 changes: 3 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
<antora-maven-plugin.version>0.0.4</antora-maven-plugin.version>
<org-antora-maven-plugin.version>1.0.0-alpha.4</org-antora-maven-plugin.version>
<antora-maven-plugin.phase>prepare-package</antora-maven-plugin.phase>
<generate-readme.phase>prepare-package</generate-readme.phase>
<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
Expand Down Expand Up @@ -1066,22 +1067,14 @@
</executions>
</plugin>
<plugin>
<groupId>io.spring.maven.antora</groupId>
<groupId>org.antora</groupId>
<artifactId>antora-maven-plugin</artifactId>
<version>${antora-maven-plugin.version}</version>
<version>${org-antora-maven-plugin.version}</version>
<configuration>
<!-- TODO: remove when CI upgrades past ubuntu 1804 -->
<node>
<version>v16.16.0</version>
</node>
<packages>
<package>@antora/[email protected]</package>
<package>@antora/[email protected]</package>
<package>@asciidoctor/[email protected]</package>
<package>@springio/[email protected]</package>
<package>@springio/[email protected]</package>
<package>[email protected]</package>
</packages>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit 1f4c1c3

Please sign in to comment.