Skip to content

Commit 016be28

Browse files
committed
Use Antora-configuration profiles.
Move Antora content to src/main/antora Closes #3123
1 parent 68f7149 commit 016be28

24 files changed

+43
-42
lines changed

spring-data-jpa-distribution/pom.xml

+25
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,40 @@
2121
<properties>
2222
<project.root>${basedir}/..</project.root>
2323
<dist.key>DATAJPA</dist.key>
24+
<antora.playbook>${project.basedir}/../src/main/antora/antora-playbook.yml</antora.playbook>
2425
</properties>
2526

2627
<build>
28+
<resources>
29+
<resource>
30+
<directory>${project.basedir}/../src/main/antora/resources/antora-resources</directory>
31+
<filtering>true</filtering>
32+
</resource>
33+
</resources>
2734
<plugins>
2835
<plugin>
2936
<groupId>org.apache.maven.plugins</groupId>
3037
<artifactId>maven-assembly-plugin</artifactId>
3138
</plugin>
39+
40+
<plugin>
41+
<groupId>io.spring.maven.antora</groupId>
42+
<artifactId>antora-maven-plugin</artifactId>
43+
</plugin>
3244
</plugins>
3345
</build>
3446

47+
<profiles>
48+
49+
<profile>
50+
<id>antora</id>
51+
<build>
52+
<plugins>
53+
54+
</plugins>
55+
</build>
56+
</profile>
57+
58+
</profiles>
59+
3560
</project>

spring-data-jpa/pom.xml

-24
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
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>
2524
</properties>
2625

2726
<dependencies>
@@ -431,29 +430,6 @@
431430
</configuration>
432431
</plugin>
433432

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>
457433
</plugins>
458434
</build>
459435

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

-12
This file was deleted.

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

+3-3
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: spring-data-jpa/src/main/antora
16+
start_path: src/main/antora
1717
worktrees: true
1818
asciidoc:
1919
attributes:
@@ -34,4 +34,4 @@ runtime:
3434
ui:
3535
bundle:
3636
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.3/ui-bundle.zip
37-
snapshot: true
37+
snapshot: true

src/main/antora/antora.yml

+12
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 process-resources -pl :spring-data-jpa-distribution -am -Pantora-process-resources
10+
local: true
11+
scan:
12+
dir: spring-data-jpa-distribution/target/classes/

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ prerelease: ${antora-component.prerelease}
44
asciidoc:
55
attributes:
66
version: ${project.version}
7-
springversionshort: 6.1
7+
springversionshort: ${spring.short}
88
springversion: ${spring}
99
attribute-missing: 'warn'
1010
spring-data-commons-docs-url: https://docs.spring.io/spring-data-commons/reference
11-
spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/data-commons/docs/current/api/
11+
spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
1212
springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
13-
springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
13+
springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api

0 commit comments

Comments
 (0)