Skip to content

Commit bd91301

Browse files
rwinchgregturn
authored andcommitted
Use antora-maven-plugin.
See #2892.
1 parent c113a0f commit bd91301

File tree

2 files changed

+16
-89
lines changed

2 files changed

+16
-89
lines changed

.github/workflows/deploy-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
docs-host: ${{ secrets.DOCS_HOST }}
4545
docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }}
4646
docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }}
47-
site-path: target/site
47+
site-path: target/antora/site
4848
- name: Bust Cloudflare Cache
4949
uses: spring-io/spring-doc-actions/[email protected]
5050
with:

pom.xml

+15-88
Original file line numberDiff line numberDiff line change
@@ -27,103 +27,30 @@
2727
<scala>2.11.7</scala>
2828
<xmlbeam>1.4.24</xmlbeam>
2929
<java-module-name>spring.data.commons</java-module-name>
30-
31-
<!-- Antora -->
32-
<node.version>v18.12.1</node.version>
33-
<npm.version>8.19.2</npm.version>
34-
<antora.version>3.2.0-alpha.2</antora.version>
35-
<antora-atlas.version>1.0.0-alpha.1</antora-atlas.version>
36-
<antora-collector.version>1.0.0-alpha.3</antora-collector.version>
37-
<asciidoctor-tabs.version>1.0.0-beta.3</asciidoctor-tabs.version>
38-
<spring-antora-extensions.version>1.5.0</spring-antora-extensions.version>
39-
<spring-asciidoctor-extensions.version>1.0.0-alpha.9</spring-asciidoctor-extensions.version>
40-
30+
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
4131
</properties>
4232

4333

4434
<build>
4535
<plugins>
4636
<plugin>
47-
<groupId>com.github.eirslett</groupId>
48-
<artifactId>frontend-maven-plugin</artifactId>
49-
<version>1.12.1</version>
50-
<executions>
51-
<execution>
52-
<id>install node and npm</id>
53-
<goals>
54-
<goal>install-node-and-npm</goal>
55-
</goals>
56-
<phase>initialize</phase>
57-
<configuration>
58-
<nodeVersion>${node.version}</nodeVersion>
59-
<npmVersion>${npm.version}</npmVersion>
60-
</configuration>
61-
</execution>
62-
<execution>
63-
<id>npm install antora</id>
64-
<goals>
65-
<goal>npm</goal>
66-
</goals>
67-
<phase>initialize</phase>
68-
<configuration>
69-
<arguments>install @antora/cli@${antora.version} @antora/site-generator-default@${antora.version} @antora/atlas-extension@${antora-atlas.version} @antora/collector-extension@${antora-collector.version} @asciidoctor/tabs@${asciidoctor-tabs.version} @springio/antora-extensions@${spring-antora-extensions.version} @springio/asciidoctor-extensions@${spring-asciidoctor-extensions.version}</arguments>
70-
</configuration>
71-
</execution>
72-
</executions>
73-
</plugin>
74-
<plugin>
75-
<groupId>org.codehaus.mojo</groupId>
76-
<artifactId>exec-maven-plugin</artifactId>
77-
<version>3.0.0</version>
78-
<executions>
79-
<execution>
80-
<id>antora</id>
81-
<goals>
82-
<goal>exec</goal>
83-
</goals>
84-
<phase>compile</phase>
85-
<configuration>
86-
<environmentVariables>
87-
<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
88-
<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
89-
<ALGOLIA_INDEX_NAME>springdatacommons</ALGOLIA_INDEX_NAME>
90-
</environmentVariables>
91-
<!-- If we don't want to depend on default node installation path we can use a maven
92-
property aligned with frontend-maven-plugin's installDirectory configuration -->
93-
<executable>node/node</executable>
94-
<arguments>
95-
<argument>node_modules/.bin/antora</argument>
96-
<argument>antora-playbook.yml</argument>
97-
<argument>--to-dir=target/site</argument>
98-
<argument>--stacktrace</argument>
99-
</arguments>
100-
<workingDirectory>${project.basedir}</workingDirectory>
101-
</configuration>
102-
</execution>
103-
</executions>
104-
</plugin>
105-
<plugin>
106-
<groupId>org.apache.maven.plugins</groupId>
107-
<artifactId>maven-clean-plugin</artifactId>
108-
<version>3.1.0</version>
37+
<groupId>io.spring.maven.antora</groupId>
38+
<artifactId>antora-maven-plugin</artifactId>
39+
<version>${io.spring.maven.antora-version}</version>
40+
<extensions>true</extensions>
10941
<configuration>
110-
<filesets>
111-
<fileset>
112-
<directory>node</directory>
113-
<followSymlinks>false</followSymlinks>
114-
</fileset>
115-
<fileset>
116-
<directory>node_modules</directory>
117-
<followSymlinks>false</followSymlinks>
118-
</fileset>
119-
<fileset>
120-
<directory>build</directory>
121-
<followSymlinks>false</followSymlinks>
122-
</fileset>
123-
</filesets>
42+
<options>
43+
<option>--to-dir=target/antora/site</option>
44+
<option>--stacktrace</option>
45+
<option>--fetch</option>
46+
</options>
47+
<environment>
48+
<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
49+
<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
50+
<ALGOLIA_INDEX_NAME>springdatacommons</ALGOLIA_INDEX_NAME>
51+
</environment>
12452
</configuration>
12553
</plugin>
126-
12754
</plugins>
12855
</build>
12956

0 commit comments

Comments
 (0)