Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8ac34bf

Browse files
committed
Use Antora-configuration profiles.
Switch from local plugin definition to the one provided by Spring Data Build. Closes #2912 
1 parent c650119 commit 8ac34bf

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

‎pom.xml‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
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-
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
3837
</properties>
3938

4039
<dependencies>
@@ -364,27 +363,24 @@
364363
<plugin>
365364
<groupId>io.spring.maven.antora</groupId>
366365
<artifactId>antora-maven-plugin</artifactId>
367-
<version>${io.spring.maven.antora-version}</version>
368-
<extensions>true</extensions>
369-
<configuration>
370-
<playbook>src/main/antora/antora-playbook.yml</playbook>
371-
</configuration>
372-
</plugin>
373-
<plugin>
374-
<groupId>io.spring.maven.antora</groupId>
375-
<artifactId>antora-component-version-maven-plugin</artifactId>
376-
<version>${io.spring.maven.antora-version}</version>
377-
<executions>
378-
<execution>
379-
<goals>
380-
<goal>antora-component-version</goal>
381-
</goals>
382-
</execution>
383-
</executions>
384366
</plugin>
385367
</plugins>
386368
</build>
387369

370+
<profiles>
371+
<profile>
372+
<id>antora-process-resources</id>
373+
<build>
374+
<resources>
375+
<resource>
376+
<directory>src/main/antora/resources/antora-resources</directory>
377+
<filtering>true</filtering>
378+
</resource>
379+
</resources>
380+
</build>
381+
</profile>
382+
</profiles>
383+
388384
<repositories>
389385
<repository>
390386
<id>spring-snapshot</id>

‎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 process-resources
9+
command: ./mvnw validate process-resources -am -Pantora-process-resources
1010
local: true
1111
scan:
12-
dir: target/classes/antora-resources
12+
dir: target/classes/antora-resources/
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
version: ${antora-component.version}
22
prerelease: ${antora-component.prerelease}
3+
34
asciidoc:
45
attributes:
56
attribute-missing: 'warn'
67
chomp: 'all'
78
version: ${project.version}
8-
springversionshort: 6.1
9+
springversionshort: ${spring.short}
910
springversion: ${spring}
10-
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/data-commons/docs/{version}/api/
1112
springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
1213
spring-framework-docs: '{springdocsurl}'
1314
springjavadocurl: https://docs.spring.io/spring-framework/docs/{springversion}/javadoc-api
1415
spring-framework-javadoc: '{springjavadocurl}'
15-
releasetrainversion: 202301 # FIXME this is wrong
16+
releasetrainversion: ${releasetrain}
1617
store: Jpa
17-
springhateoasversion: ${spring-hateoas}
18+
springhateoasversion: ${spring-hateoas}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /