Skip to content

Commit 118fe2b

Browse files
committed
Use io.spring.maven.antora plugins
- Switch to io.spring.maven.antora plugins - Move Antora to spring-data-jpa-distribution. Placing in parent folder means that each module will also have the Antora plugin applied to it and the antora task will fail on those modules.
1 parent 972b26c commit 118fe2b

24 files changed

+42
-112
lines changed

pom.xml

Lines changed: 1 addition & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,6 @@
4242

4343
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
4444

45-
<!-- Antora -->
46-
<node.version>v18.12.1</node.version>
47-
<npm.version>8.19.2</npm.version>
48-
<antora.version>3.2.0-alpha.2</antora.version>
49-
<antora-atlas.version>1.0.0-alpha.1</antora-atlas.version>
50-
<antora-collector.version>1.0.0-alpha.3</antora-collector.version>
51-
<asciidoctor-tabs.version>1.0.0-beta.3</asciidoctor-tabs.version>
52-
<spring-antora-extensions.version>1.4.0</spring-antora-extensions.version>
53-
<spring-asciidoctor-extensions.version>1.0.0-alpha.9</spring-asciidoctor-extensions.version>
54-
5545
</properties>
5646

5747
<modules>
@@ -111,93 +101,6 @@
111101
<eclipselink>4.0.2</eclipselink>
112102
</properties>
113103
</profile>
114-
<profile>
115-
<id>docs</id>
116-
<build>
117-
<plugins>
118-
<plugin>
119-
<groupId>com.github.eirslett</groupId>
120-
<artifactId>frontend-maven-plugin</artifactId>
121-
<version>1.12.1</version>
122-
<executions>
123-
<execution>
124-
<id>install-antora</id>
125-
<goals>
126-
<goal>install-node-and-npm</goal>
127-
</goals>
128-
<phase>initialize</phase>
129-
<configuration>
130-
<nodeVersion>${node.version}</nodeVersion>
131-
<npmVersion>${npm.version}</npmVersion>
132-
</configuration>
133-
</execution>
134-
<execution>
135-
<id>npm install antora</id>
136-
<goals>
137-
<goal>npm</goal>
138-
</goals>
139-
<phase>initialize</phase>
140-
<configuration>
141-
<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>
142-
</configuration>
143-
</execution>
144-
</executions>
145-
</plugin>
146-
<plugin>
147-
<groupId>org.codehaus.mojo</groupId>
148-
<artifactId>exec-maven-plugin</artifactId>
149-
<version>3.0.0</version>
150-
<executions>
151-
<execution>
152-
<id>antora</id>
153-
<goals>
154-
<goal>exec</goal>
155-
</goals>
156-
<phase>compile</phase>
157-
<configuration>
158-
<!-- If we don't want to depend on default node installation path we can use a maven
159-
property aligned with frontend-maven-plugin's installDirectory configuration -->
160-
<executable>node/node</executable>
161-
<arguments>
162-
<argument>node_modules/.bin/antora</argument>
163-
<argument>src/main/antora/antora-playbook.yml</argument>
164-
<argument>--to-dir=target/site</argument>
165-
</arguments>
166-
<workingDirectory>${project.parent.basedir}</workingDirectory>
167-
</configuration>
168-
</execution>
169-
</executions>
170-
</plugin>
171-
<plugin>
172-
<groupId>org.apache.maven.plugins</groupId>
173-
<artifactId>maven-clean-plugin</artifactId>
174-
<version>3.1.0</version>
175-
<configuration>
176-
<filesets>
177-
<fileset>
178-
<directory>node</directory>
179-
<followSymlinks>false</followSymlinks>
180-
</fileset>
181-
<fileset>
182-
<directory>node_modules</directory>
183-
<followSymlinks>false</followSymlinks>
184-
</fileset>
185-
<fileset>
186-
<directory>build</directory>
187-
<followSymlinks>false</followSymlinks>
188-
</fileset>
189-
</filesets>
190-
</configuration>
191-
</plugin>
192-
</plugins>
193-
<resources>
194-
<resource>
195-
<directory>src/main/resources</directory>
196-
<filtering>true</filtering>
197-
</resource>
198-
</resources>
199-
</build>
200-
</profile>
201104
</profiles>
202105

203106
<dependencyManagement>
@@ -298,6 +201,7 @@
298201
</execution>
299202
</executions>
300203
</plugin>
204+
301205
</plugins>
302206
</build>
303207

spring-data-jpa-distribution/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<properties>
2222
<project.root>${basedir}/..</project.root>
2323
<dist.key>DATAJPA</dist.key>
24+
25+
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
26+
2427
</properties>
2528

2629
<build>
@@ -29,6 +32,28 @@
2932
<groupId>org.apache.maven.plugins</groupId>
3033
<artifactId>maven-assembly-plugin</artifactId>
3134
</plugin>
35+
36+
<plugin>
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>
41+
<configuration>
42+
<playbook>src/main/antora/antora-playbook.yml</playbook>
43+
</configuration>
44+
</plugin>
45+
<plugin>
46+
<groupId>io.spring.maven.antora</groupId>
47+
<artifactId>antora-component-version-maven-plugin</artifactId>
48+
<version>${io.spring.maven.antora-version}</version>
49+
<executions>
50+
<execution>
51+
<goals>
52+
<goal>antora-component-version</goal>
53+
</goals>
54+
</execution>
55+
</executions>
56+
</plugin>
3257
</plugins>
3358
</build>
3459

src/main/antora/antora-playbook.yml renamed to spring-data-jpa-distribution/src/main/antora/antora-playbook.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ site:
1111
url: https://docs.spring.io/spring-data-jpa/reference/
1212
content:
1313
sources:
14-
- url: ./../../..
14+
- url: ./../../../..
1515
branches: HEAD
16-
start_path: src/main/antora
16+
start_path: spring-data-jpa-distribution/src/main/antora
1717
worktrees: true
1818
asciidoc:
1919
attributes:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: data-jpa
2+
version: true
3+
title: Spring Data JPA
4+
nav:
5+
- modules/ROOT/nav.adoc
6+
ext:
7+
collector:
8+
- run:
9+
command: mvnw validate resources:resources -pl :spring-data-jpa-distribution -am
10+
local: true
11+
scan:
12+
dir: spring-data-jpa-distribution/target/classes/antora-resources

src/main/resources/antora-resources/antora.yml renamed to spring-data-jpa-distribution/src/main/antora/resources/antora-resources/antora.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
version: ${project.version}
1+
version: ${antora-component.version}
2+
prerelease: ${antora-component.prerelease}
23

34
asciidoc:
45
attributes:

src/main/antora/antora.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)