Skip to content

Commit 68f7149

Browse files
rwinchgregturn
authored andcommitted
Use io.spring.maven.antora plugins.
- Switch to io.spring.maven.antora plugins - Move Antora to spring-data-jpa modulen. 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. See #3094
1 parent d6bd571 commit 68f7149

23 files changed

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

209112
<dependencyManagement>
@@ -304,6 +207,7 @@
304207
</execution>
305208
</executions>
306209
</plugin>
210+
307211
</plugins>
308212
</build>
309213

spring-data-jpa/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
<properties>
2323
<java-module-name>spring.data.jpa</java-module-name>
24+
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
2425
</properties>
2526

2627
<dependencies>
@@ -430,6 +431,29 @@
430431
</configuration>
431432
</plugin>
432433

434+
435+
436+
<plugin>
437+
<groupId>io.spring.maven.antora</groupId>
438+
<artifactId>antora-maven-plugin</artifactId>
439+
<version>${io.spring.maven.antora-version}</version>
440+
<extensions>true</extensions>
441+
<configuration>
442+
<playbook>src/main/antora/antora-playbook.yml</playbook>
443+
</configuration>
444+
</plugin>
445+
<plugin>
446+
<groupId>io.spring.maven.antora</groupId>
447+
<artifactId>antora-component-version-maven-plugin</artifactId>
448+
<version>${io.spring.maven.antora-version}</version>
449+
<executions>
450+
<execution>
451+
<goals>
452+
<goal>antora-component-version</goal>
453+
</goals>
454+
</execution>
455+
</executions>
456+
</plugin>
433457
</plugins>
434458
</build>
435459

src/main/antora/antora-playbook.yml renamed to spring-data-jpa/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/src/main/antora
1717
worktrees: true
1818
asciidoc:
1919
attributes:

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

Lines changed: 2 additions & 2 deletions
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 validate resources:resources -pl :spring-data-jpa -am
1010
local: true
1111
scan:
12-
dir: target/classes/antora-resources
12+
dir: spring-data-jpa/target/classes/antora-resources

src/main/resources/antora-resources/antora.yml renamed to spring-data-jpa/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:

0 commit comments

Comments
 (0)