Skip to content

Commit cc82e2d

Browse files
committed
Upgrade Antora.
1 parent d174517 commit cc82e2d

File tree

5 files changed

+23
-35
lines changed

5 files changed

+23
-35
lines changed

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
echo BUILD_VERSION=$BUILD_VERSION >> $GITHUB_ENV
3737
- name: Run Antora
3838
run: |
39-
./mvnw --no-transfer-progress -B antora
39+
./mvnw --no-transfer-progress -B antora -Pdocs
4040
- name: Publish Docs
4141
uses: spring-io/spring-doc-actions/[email protected]
4242
with:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ src/ant/.ant-targets-upload-dist.xml
1818
node
1919
node_modules
2020
build
21-
package.json
21+
docs/package.json
2222
package-lock.json

antora-playbook.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
antora:
22
extensions:
3-
- '@springio/antora-extensions/partial-build-extension'
4-
# atlas-extension must be before latest-version-extension so latest versions are applied to imported versions
5-
- '@antora/atlas-extension'
6-
- require: '@springio/antora-extensions/latest-version-extension'
7-
- require: '@springio/antora-extensions/inject-collector-cache-config-extension'
8-
- '@antora/collector-extension'
9-
- require: '@springio/antora-extensions/root-component-extension'
3+
- require: '@springio/antora-extensions'
104
root_component_name: 'cloud-kubernetes'
11-
- '@springio/antora-extensions/static-page-extension'
125
site:
136
title: Spring Cloud Kubernetes
147
url: https://docs.spring.io/spring-cloud-kubernetes/reference
@@ -38,7 +31,7 @@ urls:
3831
redirect_facility: httpd
3932
ui:
4033
bundle:
41-
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/ui-bundle.zip
34+
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip
4235
snapshot: true
4336
runtime:
4437
log:

package.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"dependencies": {
3+
"antora": "3.2.0-alpha.4",
4+
"@antora/atlas-extension": "1.0.0-alpha.2",
5+
"@antora/collector-extension": "1.0.0-alpha.3",
6+
"@asciidoctor/tabs": "1.0.0-beta.6",
7+
"@springio/antora-extensions": "1.11.1",
8+
"@springio/asciidoctor-extensions": "1.0.0-alpha.10",
9+
"asciidoctor-kroki": "0.18.1"
10+
}
11+
}

pom.xml

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>org.springframework.cloud</groupId>
76
<artifactId>spring-cloud-kubernetes-docs-build</artifactId>
8-
<version>0.0.1-SNAPSHOT</version>
7+
<version>${parent.version}</version>
8+
9+
<parent>
10+
<groupId>org.springframework.cloud</groupId>
11+
<artifactId>spring-cloud-kubernetes</artifactId>
12+
<version>3.1.4-SNAPSHOT</version>
13+
</parent>
914

1015
<name>Spring Cloud Kubernetes Docs Build</name>
1116
<description>Builds Spring Cloud Kubernetes Docs.</description>
@@ -30,29 +35,8 @@
3035
<build>
3136
<plugins>
3237
<plugin>
33-
<groupId>io.spring.maven.antora</groupId>
38+
<groupId>org.antora</groupId>
3439
<artifactId>antora-maven-plugin</artifactId>
35-
<version>${io.spring.maven.antora-version}</version>
36-
<extensions>true</extensions>
37-
<configuration>
38-
<options>
39-
<option>--to-dir=target/antora/site</option>
40-
<option>--stacktrace</option>
41-
<option>--fetch</option>
42-
</options>
43-
<environment>
44-
<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
45-
<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
46-
<ALGOLIA_INDEX_NAME>springdocs</ALGOLIA_INDEX_NAME>
47-
</environment>
48-
<packages>
49-
<package>@antora/[email protected]</package>
50-
<package>@antora/[email protected]</package>
51-
<package>@asciidoctor/[email protected]</package>
52-
<package>@springio/[email protected]</package>
53-
<package>@springio/[email protected]</package>
54-
</packages>
55-
</configuration>
5640
</plugin>
5741
</plugins>
5842
</build>

0 commit comments

Comments
 (0)