Browse Source

Use Antora-configuration profiles.

Move Antora content to src/main/antora

Closes #3123
pull/3132/head
Mark Paluch 3 years ago
parent
commit
016be28e79
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 25
      spring-data-jpa-distribution/pom.xml
  2. 24
      spring-data-jpa/pom.xml
  3. 12
      spring-data-jpa/src/main/antora/antora.yml
  4. 6
      src/main/antora/antora-playbook.yml
  5. 12
      src/main/antora/antora.yml
  6. 0
      src/main/antora/modules/ROOT/nav.adoc
  7. 0
      src/main/antora/modules/ROOT/pages/envers.adoc
  8. 0
      src/main/antora/modules/ROOT/pages/faq.adoc
  9. 0
      src/main/antora/modules/ROOT/pages/glossary.adoc
  10. 0
      src/main/antora/modules/ROOT/pages/index.adoc
  11. 0
      src/main/antora/modules/ROOT/pages/jpa.adoc
  12. 0
      src/main/antora/modules/ROOT/pages/jpa/auditing.adoc
  13. 0
      src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc
  14. 0
      src/main/antora/modules/ROOT/pages/jpa/introduction.adoc
  15. 0
      src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc
  16. 0
      src/main/antora/modules/ROOT/pages/jpa/locking.adoc
  17. 0
      src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc
  18. 0
      src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc
  19. 0
      src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc
  20. 0
      src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc
  21. 0
      src/main/antora/modules/ROOT/pages/jpa/specifications.adoc
  22. 0
      src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc
  23. 0
      src/main/antora/modules/ROOT/pages/jpa/transactions.adoc
  24. 6
      src/main/antora/resources/antora-resources/antora.yml

25
spring-data-jpa-distribution/pom.xml

@ -21,15 +21,40 @@ @@ -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
spring-data-jpa/pom.xml

@ -21,7 +21,6 @@ @@ -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>
@ -431,29 +430,6 @@ @@ -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>

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

@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
name: data-jpa
version: true
title: Spring Data JPA
nav:
- modules/ROOT/nav.adoc
ext:
collector:
- run:
command: mvnw validate resources:resources -pl :spring-data-jpa -am
local: true
scan:
dir: spring-data-jpa/target/classes/antora-resources

6
spring-data-jpa/src/main/antora/antora-playbook.yml → src/main/antora/antora-playbook.yml

@ -11,9 +11,9 @@ site: @@ -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:
@ -34,4 +34,4 @@ runtime: @@ -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
src/main/antora/antora.yml

@ -0,0 +1,12 @@ @@ -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/

0
spring-data-jpa/src/main/antora/modules/ROOT/nav.adoc → src/main/antora/modules/ROOT/nav.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/envers.adoc → src/main/antora/modules/ROOT/pages/envers.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/faq.adoc → src/main/antora/modules/ROOT/pages/faq.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/glossary.adoc → src/main/antora/modules/ROOT/pages/glossary.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/index.adoc → src/main/antora/modules/ROOT/pages/index.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa.adoc → src/main/antora/modules/ROOT/pages/jpa.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc → src/main/antora/modules/ROOT/pages/jpa/auditing.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc → src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc → src/main/antora/modules/ROOT/pages/jpa/introduction.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc → src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/locking.adoc → src/main/antora/modules/ROOT/pages/jpa/locking.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc → src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc → src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc → src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc → src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc → src/main/antora/modules/ROOT/pages/jpa/specifications.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc → src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc

0
spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc → src/main/antora/modules/ROOT/pages/jpa/transactions.adoc

6
spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml → src/main/antora/resources/antora-resources/antora.yml

@ -4,10 +4,10 @@ prerelease: ${antora-component.prerelease} @@ -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
Loading…
Cancel
Save