Skip to content

Commit d58b313

Browse files
committed
Upgrade antora
1 parent bf90641 commit d58b313

File tree

4 files changed

+20
-57
lines changed

4 files changed

+20
-57
lines changed

.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ 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
23-
.flattened-pom.xml
23+
.flattened-pom.xml

antora-playbook.yml

+2-9
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-consul'
11-
- '@springio/antora-extensions/static-page-extension'
125
site:
136
title: Spring Cloud Consul
147
url: https://docs.spring.io/spring-cloud-consul/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.12/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

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
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+
}
10+
}

pom.xml

+6-46
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>org.springframework.cloud</groupId>
76
<artifactId>spring-cloud-consul-docs-build</artifactId>
87
<version>0.0.1-SNAPSHOT</version>
8+
<parent>
9+
<groupId>org.springframework.cloud</groupId>
10+
<artifactId>spring-cloud-consul</artifactId>
11+
<version>4.1.2-SNAPSHOT</version>
12+
</parent>
913

1014
<name>Spring Cloud Consul Docs Build</name>
1115
<description>Builds Spring Cloud Consul Docs.</description>
@@ -22,56 +26,12 @@
2226
<url>https://github.com/spring-cloud/spring-cloud-consul/issues</url>
2327
</issueManagement>
2428

25-
<properties>
26-
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
27-
</properties>
28-
29-
3029
<build>
3130
<plugins>
3231
<plugin>
33-
<groupId>io.spring.maven.antora</groupId>
32+
<groupId>org.antora</groupId>
3433
<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>
5634
</plugin>
5735
</plugins>
5836
</build>
59-
60-
<repositories>
61-
<repository>
62-
<id>spring-snapshot</id>
63-
<url>https://repo.spring.io/snapshot</url>
64-
<snapshots>
65-
<enabled>true</enabled>
66-
</snapshots>
67-
<releases>
68-
<enabled>false</enabled>
69-
</releases>
70-
</repository>
71-
<repository>
72-
<id>spring-milestone</id>
73-
<url>https://repo.spring.io/milestone</url>
74-
</repository>
75-
</repositories>
76-
7737
</project>

0 commit comments

Comments
 (0)