Skip to content

Commit

Permalink
Use Antora-configuration profiles.
Browse files Browse the repository at this point in the history
Switch from local plugin definition to the one provided by Spring Data Build.

Closes #2912
  • Loading branch information
mp911de committed Aug 21, 2023
1 parent c650119 commit 8ac34bf
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 24 deletions.
32 changes: 14 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<xmlbeam>1.4.24</xmlbeam>
<java-module-name>spring.data.commons</java-module-name>
<kotlin.api.target>1.8</kotlin.api.target>
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
</properties>

<dependencies>
Expand Down Expand Up @@ -364,27 +363,24 @@
<plugin>
<groupId>io.spring.maven.antora</groupId>
<artifactId>antora-maven-plugin</artifactId>
<version>${io.spring.maven.antora-version}</version>
<extensions>true</extensions>
<configuration>
<playbook>src/main/antora/antora-playbook.yml</playbook>
</configuration>
</plugin>
<plugin>
<groupId>io.spring.maven.antora</groupId>
<artifactId>antora-component-version-maven-plugin</artifactId>
<version>${io.spring.maven.antora-version}</version>
<executions>
<execution>
<goals>
<goal>antora-component-version</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>antora-process-resources</id>
<build>
<resources>
<resource>
<directory>src/main/antora/resources/antora-resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>spring-snapshot</id>
Expand Down
4 changes: 2 additions & 2 deletions src/main/antora/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ nav:
ext:
collector:
- run:
command: mvnw process-resources
command: ./mvnw validate process-resources -am -Pantora-process-resources
local: true
scan:
dir: target/classes/antora-resources
dir: target/classes/antora-resources/
9 changes: 5 additions & 4 deletions src/main/antora/resources/antora-resources/antora.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
version: ${antora-component.version}
prerelease: ${antora-component.prerelease}

asciidoc:
attributes:
attribute-missing: 'warn'
chomp: 'all'
version: ${project.version}
springversionshort: 6.1
springversionshort: ${spring.short}
springversion: ${spring}
spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/data-commons/docs/current/api/
spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/data-commons/docs/{version}/api/
springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
spring-framework-docs: '{springdocsurl}'
springjavadocurl: https://docs.spring.io/spring-framework/docs/{springversion}/javadoc-api
spring-framework-javadoc: '{springjavadocurl}'
releasetrainversion: 2023.0.1 # FIXME this is wrong
releasetrainversion: ${releasetrain}
store: Jpa
springhateoasversion: ${spring-hateoas}
springhateoasversion: ${spring-hateoas}

0 comments on commit 8ac34bf

Please sign in to comment.