diff --git a/pom.xml b/pom.xml index b709f1f03a..d63ed1c14b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,16 +42,6 @@ reuseReports - - v18.12.1 - 8.19.2 - 3.2.0-alpha.2 - 1.0.0-alpha.1 - 1.0.0-alpha.3 - 1.0.0-beta.3 - 1.4.0 - 1.0.0-alpha.9 - @@ -117,93 +107,6 @@ 4.0.2 - - docs - - - - com.github.eirslett - frontend-maven-plugin - 1.12.1 - - - install-antora - - install-node-and-npm - - initialize - - ${node.version} - ${npm.version} - - - - npm install antora - - npm - - initialize - - install @antora/cli@${antora.version} @antora/site-generator-default@${antora.version} @antora/atlas-extension@${antora-atlas.version} @antora/collector-extension@${antora-collector.version} @asciidoctor/tabs@${asciidoctor-tabs.version} @springio/antora-extensions@${spring-antora-extensions.version} @springio/asciidoctor-extensions@${spring-asciidoctor-extensions.version} - - - - - - org.codehaus.mojo - exec-maven-plugin - 3.0.0 - - - antora - - exec - - compile - - - node/node - - node_modules/.bin/antora - src/main/antora/antora-playbook.yml - --to-dir=target/site - - ${project.parent.basedir} - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - node - false - - - node_modules - false - - - build - false - - - - - - - - src/main/resources - true - - - - @@ -304,6 +207,7 @@ + diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml index b21b03c313..19bc4279e7 100644 --- a/spring-data-jpa/pom.xml +++ b/spring-data-jpa/pom.xml @@ -21,6 +21,7 @@ spring.data.jpa + 0.0.3 @@ -430,6 +431,29 @@ + + + + io.spring.maven.antora + antora-maven-plugin + ${io.spring.maven.antora-version} + true + + src/main/antora/antora-playbook.yml + + + + io.spring.maven.antora + antora-component-version-maven-plugin + ${io.spring.maven.antora-version} + + + + antora-component-version + + + + diff --git a/src/main/antora/antora-playbook.yml b/spring-data-jpa/src/main/antora/antora-playbook.yml similarity index 93% rename from src/main/antora/antora-playbook.yml rename to spring-data-jpa/src/main/antora/antora-playbook.yml index 643dd938eb..f234b092a3 100644 --- a/src/main/antora/antora-playbook.yml +++ b/spring-data-jpa/src/main/antora/antora-playbook.yml @@ -11,9 +11,9 @@ site: url: https://docs.spring.io/spring-data-jpa/reference/ content: sources: - - url: ./../../.. + - url: ./../../../.. branches: HEAD - start_path: src/main/antora + start_path: spring-data-jpa/src/main/antora worktrees: true asciidoc: attributes: diff --git a/src/main/antora/antora.yml b/spring-data-jpa/src/main/antora/antora.yml similarity index 50% rename from src/main/antora/antora.yml rename to spring-data-jpa/src/main/antora/antora.yml index edf3154af3..b728d86ef6 100644 --- a/src/main/antora/antora.yml +++ b/spring-data-jpa/src/main/antora/antora.yml @@ -6,7 +6,7 @@ nav: ext: collector: - run: - command: mvnw -Pdocs resources:resources + command: mvnw validate resources:resources -pl :spring-data-jpa -am local: true scan: - dir: target/classes/antora-resources + dir: spring-data-jpa/target/classes/antora-resources diff --git a/src/main/antora/modules/ROOT/nav.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/nav.adoc similarity index 100% rename from src/main/antora/modules/ROOT/nav.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/nav.adoc diff --git a/src/main/antora/modules/ROOT/pages/envers.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/envers.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/envers.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/envers.adoc diff --git a/src/main/antora/modules/ROOT/pages/faq.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/faq.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/faq.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/faq.adoc diff --git a/src/main/antora/modules/ROOT/pages/glossary.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/glossary.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/glossary.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/glossary.adoc diff --git a/src/main/antora/modules/ROOT/pages/index.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/index.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/index.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/index.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/auditing.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/auditing.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/introduction.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/introduction.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/locking.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/locking.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/locking.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/locking.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-context.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/query-methods.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/specifications.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/specifications.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc diff --git a/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc b/spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc similarity index 100% rename from src/main/antora/modules/ROOT/pages/jpa/transactions.adoc rename to spring-data-jpa/src/main/antora/modules/ROOT/pages/jpa/transactions.adoc diff --git a/src/main/resources/antora-resources/antora.yml b/spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml similarity index 86% rename from src/main/resources/antora-resources/antora.yml rename to spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml index 059abf1920..b17d78e0d8 100644 --- a/src/main/resources/antora-resources/antora.yml +++ b/spring-data-jpa/src/main/antora/resources/antora-resources/antora.yml @@ -1,4 +1,5 @@ -version: ${project.version} +version: ${antora-component.version} +prerelease: ${antora-component.prerelease} asciidoc: attributes: