Skip to content

Commit

Permalink
Use Antora-configuration profiles.
Browse files Browse the repository at this point in the history
Move Antora content to src/main/antora

Closes #3123
  • Loading branch information
mp911de committed Aug 21, 2023
1 parent 68f7149 commit 016be28
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 42 deletions.
25 changes: 25 additions & 0 deletions spring-data-jpa-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,40 @@
<properties>
<project.root>${basedir}/..</project.root>
<dist.key>DATAJPA</dist.key>
<antora.playbook>${project.basedir}/../src/main/antora/antora-playbook.yml</antora.playbook>
</properties>

<build>
<resources>
<resource>
<directory>${project.basedir}/../src/main/antora/resources/antora-resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>

<plugin>
<groupId>io.spring.maven.antora</groupId>
<artifactId>antora-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

<profiles>

<profile>
<id>antora</id>
<build>
<plugins>

</plugins>
</build>
</profile>

</profiles>

</project>
24 changes: 0 additions & 24 deletions spring-data-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

<properties>
<java-module-name>spring.data.jpa</java-module-name>
<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
</properties>

<dependencies>
Expand Down Expand Up @@ -431,29 +430,6 @@
</configuration>
</plugin>



<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>

Expand Down
12 changes: 0 additions & 12 deletions spring-data-jpa/src/main/antora/antora.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ site:
url: https://docs.spring.io/spring-data-jpa/reference/
content:
sources:
- url: ./../../../..
- url: ./../../..
branches: HEAD
start_path: spring-data-jpa/src/main/antora
start_path: src/main/antora
worktrees: true
asciidoc:
attributes:
Expand All @@ -34,4 +34,4 @@ runtime:
ui:
bundle:
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.3.3/ui-bundle.zip
snapshot: true
snapshot: true
12 changes: 12 additions & 0 deletions src/main/antora/antora.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: data-jpa
version: true
title: Spring Data JPA
nav:
- modules/ROOT/nav.adoc
ext:
collector:
- run:
command: ./mvnw validate process-resources -pl :spring-data-jpa-distribution -am -Pantora-process-resources
local: true
scan:
dir: spring-data-jpa-distribution/target/classes/
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ prerelease: ${antora-component.prerelease}
asciidoc:
attributes:
version: ${project.version}
springversionshort: 6.1
springversionshort: ${spring.short}
springversion: ${spring}
attribute-missing: 'warn'
spring-data-commons-docs-url: https://docs.spring.io/spring-data-commons/reference
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/commons/docs/${springdata.commons}/api/
springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api

0 comments on commit 016be28

Please sign in to comment.