Skip to content

Commit c05ed09

Browse files
rwinchgregturn
rwinch
authored and
gregturn
committed
Use io.spring.maven.antora.
See #2890.
1 parent 9109378 commit c05ed09

File tree

3 files changed

+25
-103
lines changed

3 files changed

+25
-103
lines changed

‎pom.xml

+22-100
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,7 @@
3434
<xmlbeam>1.4.24</xmlbeam>
3535
<java-module-name>spring.data.commons</java-module-name>
3636
<kotlin.api.target>1.8</kotlin.api.target>
37-
38-
<!-- Antora -->
39-
<node.version>v18.12.1</node.version>
40-
<npm.version>8.19.2</npm.version>
41-
<antora.version>3.2.0-alpha.2</antora.version>
42-
<antora-atlas.version>1.0.0-alpha.1</antora-atlas.version>
43-
<antora-collector.version>1.0.0-alpha.3</antora-collector.version>
44-
<asciidoctor-tabs.version>1.0.0-beta.3</asciidoctor-tabs.version>
45-
<spring-antora-extensions.version>1.5.0</spring-antora-extensions.version>
46-
<spring-asciidoctor-extensions.version>1.0.0-alpha.9</spring-asciidoctor-extensions.version>
37+
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
4738
</properties>
4839

4940
<dependencies>
@@ -366,99 +357,30 @@
366357
<groupId>org.apache.maven.plugins</groupId>
367358
<artifactId>maven-assembly-plugin</artifactId>
368359
</plugin>
360+
<plugin>
361+
<groupId>io.spring.maven.antora</groupId>
362+
<artifactId>antora-maven-plugin</artifactId>
363+
<version>${io.spring.maven.antora-version}</version>
364+
<extensions>true</extensions>
365+
<configuration>
366+
<playbook>src/main/antora/antora-playbook.yml</playbook>
367+
</configuration>
368+
</plugin>
369+
<plugin>
370+
<groupId>io.spring.maven.antora</groupId>
371+
<artifactId>antora-component-version-maven-plugin</artifactId>
372+
<version>${io.spring.maven.antora-version}</version>
373+
<executions>
374+
<execution>
375+
<goals>
376+
<goal>antora-component-version</goal>
377+
</goals>
378+
</execution>
379+
</executions>
380+
</plugin>
369381
</plugins>
370382
</build>
371383

372-
<profiles>
373-
<profile>
374-
<id>docs</id>
375-
<build>
376-
<plugins>
377-
<plugin>
378-
<groupId>com.github.eirslett</groupId>
379-
<artifactId>frontend-maven-plugin</artifactId>
380-
<version>1.12.1</version>
381-
<executions>
382-
<execution>
383-
<id>install node and npm</id>
384-
<goals>
385-
<goal>install-node-and-npm</goal>
386-
</goals>
387-
<phase>initialize</phase>
388-
<configuration>
389-
<nodeVersion>${node.version}</nodeVersion>
390-
<npmVersion>${npm.version}</npmVersion>
391-
</configuration>
392-
</execution>
393-
<execution>
394-
<id>npm install antora</id>
395-
<goals>
396-
<goal>npm</goal>
397-
</goals>
398-
<phase>initialize</phase>
399-
<configuration>
400-
<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>
401-
</configuration>
402-
</execution>
403-
</executions>
404-
</plugin>
405-
<plugin>
406-
<groupId>org.codehaus.mojo</groupId>
407-
<artifactId>exec-maven-plugin</artifactId>
408-
<version>3.0.0</version>
409-
<executions>
410-
<execution>
411-
<id>antora</id>
412-
<goals>
413-
<goal>exec</goal>
414-
</goals>
415-
<phase>compile</phase>
416-
<configuration>
417-
<!-- If we don't want to depend on default node installation path we can use a maven
418-
property aligned with frontend-maven-plugin's installDirectory configuration -->
419-
<executable>node/node</executable>
420-
<arguments>
421-
<argument>node_modules/.bin/antora</argument>
422-
<argument>src/main/antora/antora-playbook.yml</argument>
423-
<argument>--to-dir=target/site</argument>
424-
</arguments>
425-
<workingDirectory>${project.basedir}</workingDirectory>
426-
</configuration>
427-
</execution>
428-
</executions>
429-
</plugin>
430-
<plugin>
431-
<groupId>org.apache.maven.plugins</groupId>
432-
<artifactId>maven-clean-plugin</artifactId>
433-
<version>3.1.0</version>
434-
<configuration>
435-
<filesets>
436-
<fileset>
437-
<directory>node</directory>
438-
<followSymlinks>false</followSymlinks>
439-
</fileset>
440-
<fileset>
441-
<directory>node_modules</directory>
442-
<followSymlinks>false</followSymlinks>
443-
</fileset>
444-
<fileset>
445-
<directory>build</directory>
446-
<followSymlinks>false</followSymlinks>
447-
</fileset>
448-
</filesets>
449-
</configuration>
450-
</plugin>
451-
</plugins>
452-
<resources>
453-
<resource>
454-
<directory>src/main/resources</directory>
455-
<filtering>true</filtering>
456-
</resource>
457-
</resources>
458-
</build>
459-
</profile>
460-
</profiles>
461-
462384
<repositories>
463385
<repository>
464386
<id>spring-snapshot</id>

‎src/main/antora/antora.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ nav:
66
ext:
77
collector:
88
- run:
9-
command: mvnw -Pdocs resources:resources
9+
command: mvnw process-resources
1010
local: true
1111
scan:
1212
dir: target/classes/antora-resources

‎src/main/resources/antora-resources/antora.yml renamed to ‎src/main/antora/resources/antora-resources/antora.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: ${project.version}
2-
1+
version: ${antora-component.version}
2+
prerelease: ${antora-component.prerelease}
33
asciidoc:
44
attributes:
55
attribute-missing: 'warn'

0 commit comments

Comments
 (0)