diff --git a/antora-playbook.yml b/antora-playbook.yml index 62ecb6b90..b8bb4d837 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -8,12 +8,12 @@ antora: root_component_name: 'data-commons' site: title: Spring Data Reference - url: https://https://rwinch.github.io/spring-data-commons/ + url: https://rwinch.github.io/spring-data-commons/ content: sources: - url: . branches: HEAD - start_path: . + start_path: src/main/antora worktrees: true asciidoc: attributes: diff --git a/modules/ROOT/assets/images/epub-cover.png b/modules/ROOT/assets/images/epub-cover.png deleted file mode 100644 index 539b90504..000000000 Binary files a/modules/ROOT/assets/images/epub-cover.png and /dev/null differ diff --git a/modules/ROOT/assets/images/epub-cover.svg b/modules/ROOT/assets/images/epub-cover.svg deleted file mode 100644 index 5f53f8a9c..000000000 --- a/modules/ROOT/assets/images/epub-cover.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Spring Data Commons - Reference Guide - Oliver Gierke, Thomas Darimont, - Christoph Strobl, Mark Pollack, - Thomas Risberg, Mark Paluch, - Jay Bryant - diff --git a/pom.xml b/pom.xml index 18fd93f0c..3713acf63 100644 --- a/pom.xml +++ b/pom.xml @@ -366,90 +366,99 @@ org.apache.maven.plugins maven-assembly-plugin - - com.github.eirslett - frontend-maven-plugin - 1.12.1 - - - install node and npm - - 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 - antora-playbook.yml - --to-dir=target/site - - ${project.basedir} - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - - node - false - - - node_modules - false - - - build - false - - - - - - - - src/main/resources - true - - + + + docs + + + + com.github.eirslett + frontend-maven-plugin + 1.12.1 + + + install node and npm + + 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 + antora-playbook.yml + --to-dir=target/site + + ${project.basedir} + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + + node + false + + + node_modules + false + + + build + false + + + + + + + + src/main/resources + true + + + + + + spring-snapshot diff --git a/antora.yml b/src/main/antora/antora.yml similarity index 61% rename from antora.yml rename to src/main/antora/antora.yml index 242acc8f8..62b9e1155 100644 --- a/antora.yml +++ b/src/main/antora/antora.yml @@ -6,7 +6,7 @@ nav: ext: collector: - run: - command: mvnw resources:resources + command: mvnw -Pdocs resources:resources local: true scan: - dir: ./target/classes/antora-resources + dir: target/classes/antora-resources diff --git a/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc similarity index 100% rename from modules/ROOT/nav.adoc rename to src/main/antora/modules/ROOT/nav.adoc diff --git a/modules/ROOT/pages/auditing.adoc b/src/main/antora/modules/ROOT/pages/auditing.adoc similarity index 100% rename from modules/ROOT/pages/auditing.adoc rename to src/main/antora/modules/ROOT/pages/auditing.adoc diff --git a/modules/ROOT/pages/custom-conversions.adoc b/src/main/antora/modules/ROOT/pages/custom-conversions.adoc similarity index 100% rename from modules/ROOT/pages/custom-conversions.adoc rename to src/main/antora/modules/ROOT/pages/custom-conversions.adoc diff --git a/modules/ROOT/pages/dependencies.adoc b/src/main/antora/modules/ROOT/pages/dependencies.adoc similarity index 100% rename from modules/ROOT/pages/dependencies.adoc rename to src/main/antora/modules/ROOT/pages/dependencies.adoc diff --git a/modules/ROOT/pages/entity-callbacks.adoc b/src/main/antora/modules/ROOT/pages/entity-callbacks.adoc similarity index 100% rename from modules/ROOT/pages/entity-callbacks.adoc rename to src/main/antora/modules/ROOT/pages/entity-callbacks.adoc diff --git a/modules/ROOT/pages/index.adoc b/src/main/antora/modules/ROOT/pages/index.adoc similarity index 92% rename from modules/ROOT/pages/index.adoc rename to src/main/antora/modules/ROOT/pages/index.adoc index 7490a4166..f132c6a38 100644 --- a/modules/ROOT/pages/index.adoc +++ b/src/main/antora/modules/ROOT/pages/index.adoc @@ -4,7 +4,6 @@ Oliver Gierke; Thomas Darimont; Christoph Strobl; Mark Pollack; Thomas Risberg; :revnumber: {version} :revdate: {localdate} :feature-scroll: true -ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]] (C) 2008-2022 The original authors. diff --git a/modules/ROOT/pages/is-new-state-detection.adoc b/src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc similarity index 100% rename from modules/ROOT/pages/is-new-state-detection.adoc rename to src/main/antora/modules/ROOT/pages/is-new-state-detection.adoc diff --git a/modules/ROOT/pages/kotlin.adoc b/src/main/antora/modules/ROOT/pages/kotlin.adoc similarity index 100% rename from modules/ROOT/pages/kotlin.adoc rename to src/main/antora/modules/ROOT/pages/kotlin.adoc diff --git a/modules/ROOT/pages/kotlin/coroutines.adoc b/src/main/antora/modules/ROOT/pages/kotlin/coroutines.adoc similarity index 100% rename from modules/ROOT/pages/kotlin/coroutines.adoc rename to src/main/antora/modules/ROOT/pages/kotlin/coroutines.adoc diff --git a/modules/ROOT/pages/kotlin/extensions.adoc b/src/main/antora/modules/ROOT/pages/kotlin/extensions.adoc similarity index 100% rename from modules/ROOT/pages/kotlin/extensions.adoc rename to src/main/antora/modules/ROOT/pages/kotlin/extensions.adoc diff --git a/modules/ROOT/pages/kotlin/null-safety.adoc b/src/main/antora/modules/ROOT/pages/kotlin/null-safety.adoc similarity index 100% rename from modules/ROOT/pages/kotlin/null-safety.adoc rename to src/main/antora/modules/ROOT/pages/kotlin/null-safety.adoc diff --git a/modules/ROOT/pages/kotlin/object-mapping.adoc b/src/main/antora/modules/ROOT/pages/kotlin/object-mapping.adoc similarity index 100% rename from modules/ROOT/pages/kotlin/object-mapping.adoc rename to src/main/antora/modules/ROOT/pages/kotlin/object-mapping.adoc diff --git a/modules/ROOT/pages/kotlin/requirements.adoc b/src/main/antora/modules/ROOT/pages/kotlin/requirements.adoc similarity index 100% rename from modules/ROOT/pages/kotlin/requirements.adoc rename to src/main/antora/modules/ROOT/pages/kotlin/requirements.adoc diff --git a/modules/ROOT/pages/object-mapping.adoc b/src/main/antora/modules/ROOT/pages/object-mapping.adoc similarity index 100% rename from modules/ROOT/pages/object-mapping.adoc rename to src/main/antora/modules/ROOT/pages/object-mapping.adoc diff --git a/modules/ROOT/pages/query-by-example.adoc b/src/main/antora/modules/ROOT/pages/query-by-example.adoc similarity index 100% rename from modules/ROOT/pages/query-by-example.adoc rename to src/main/antora/modules/ROOT/pages/query-by-example.adoc diff --git a/modules/ROOT/pages/repositories-null-handling.adoc b/src/main/antora/modules/ROOT/pages/repositories-null-handling.adoc similarity index 100% rename from modules/ROOT/pages/repositories-null-handling.adoc rename to src/main/antora/modules/ROOT/pages/repositories-null-handling.adoc diff --git a/modules/ROOT/pages/repositories-scrolling.adoc b/src/main/antora/modules/ROOT/pages/repositories-scrolling.adoc similarity index 100% rename from modules/ROOT/pages/repositories-scrolling.adoc rename to src/main/antora/modules/ROOT/pages/repositories-scrolling.adoc diff --git a/modules/ROOT/pages/repositories.adoc b/src/main/antora/modules/ROOT/pages/repositories.adoc similarity index 100% rename from modules/ROOT/pages/repositories.adoc rename to src/main/antora/modules/ROOT/pages/repositories.adoc diff --git a/modules/ROOT/pages/repositories/core-concepts.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc similarity index 100% rename from modules/ROOT/pages/repositories/core-concepts.adoc rename to src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc diff --git a/modules/ROOT/pages/repositories/core-domain-events.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-domain-events.adoc similarity index 100% rename from modules/ROOT/pages/repositories/core-domain-events.adoc rename to src/main/antora/modules/ROOT/pages/repositories/core-domain-events.adoc diff --git a/modules/ROOT/pages/repositories/core-extensions.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc similarity index 100% rename from modules/ROOT/pages/repositories/core-extensions.adoc rename to src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc diff --git a/modules/ROOT/pages/repositories/create-instances.adoc b/src/main/antora/modules/ROOT/pages/repositories/create-instances.adoc similarity index 100% rename from modules/ROOT/pages/repositories/create-instances.adoc rename to src/main/antora/modules/ROOT/pages/repositories/create-instances.adoc diff --git a/modules/ROOT/pages/repositories/custom-implementations.adoc b/src/main/antora/modules/ROOT/pages/repositories/custom-implementations.adoc similarity index 100% rename from modules/ROOT/pages/repositories/custom-implementations.adoc rename to src/main/antora/modules/ROOT/pages/repositories/custom-implementations.adoc diff --git a/modules/ROOT/pages/repositories/definition.adoc b/src/main/antora/modules/ROOT/pages/repositories/definition.adoc similarity index 100% rename from modules/ROOT/pages/repositories/definition.adoc rename to src/main/antora/modules/ROOT/pages/repositories/definition.adoc diff --git a/modules/ROOT/pages/repositories/query-methods-details.adoc b/src/main/antora/modules/ROOT/pages/repositories/query-methods-details.adoc similarity index 100% rename from modules/ROOT/pages/repositories/query-methods-details.adoc rename to src/main/antora/modules/ROOT/pages/repositories/query-methods-details.adoc diff --git a/modules/ROOT/pages/repositories/query-methods.adoc b/src/main/antora/modules/ROOT/pages/repositories/query-methods.adoc similarity index 100% rename from modules/ROOT/pages/repositories/query-methods.adoc rename to src/main/antora/modules/ROOT/pages/repositories/query-methods.adoc diff --git a/modules/ROOT/pages/repository-namespace-reference.adoc b/src/main/antora/modules/ROOT/pages/repository-namespace-reference.adoc similarity index 100% rename from modules/ROOT/pages/repository-namespace-reference.adoc rename to src/main/antora/modules/ROOT/pages/repository-namespace-reference.adoc diff --git a/modules/ROOT/pages/repository-populator-namespace-reference.adoc b/src/main/antora/modules/ROOT/pages/repository-populator-namespace-reference.adoc similarity index 100% rename from modules/ROOT/pages/repository-populator-namespace-reference.adoc rename to src/main/antora/modules/ROOT/pages/repository-populator-namespace-reference.adoc diff --git a/modules/ROOT/pages/repository-projections.adoc b/src/main/antora/modules/ROOT/pages/repository-projections.adoc similarity index 100% rename from modules/ROOT/pages/repository-projections.adoc rename to src/main/antora/modules/ROOT/pages/repository-projections.adoc diff --git a/modules/ROOT/pages/repository-query-keywords-reference.adoc b/src/main/antora/modules/ROOT/pages/repository-query-keywords-reference.adoc similarity index 100% rename from modules/ROOT/pages/repository-query-keywords-reference.adoc rename to src/main/antora/modules/ROOT/pages/repository-query-keywords-reference.adoc diff --git a/modules/ROOT/pages/repository-query-return-types-reference.adoc b/src/main/antora/modules/ROOT/pages/repository-query-return-types-reference.adoc similarity index 100% rename from modules/ROOT/pages/repository-query-return-types-reference.adoc rename to src/main/antora/modules/ROOT/pages/repository-query-return-types-reference.adoc diff --git a/modules/ROOT/pages/upgrade.adoc b/src/main/antora/modules/ROOT/pages/upgrade.adoc similarity index 100% rename from modules/ROOT/pages/upgrade.adoc rename to src/main/antora/modules/ROOT/pages/upgrade.adoc diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc index 14fd59748..ebdf86b15 100644 --- a/src/main/asciidoc/index.adoc +++ b/src/main/asciidoc/index.adoc @@ -3,7 +3,6 @@ Oliver Gierke; Thomas Darimont; Christoph Strobl; Mark Pollack; Thomas Risberg; :revnumber: {version} :revdate: {localdate} :feature-scroll: true -ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]] (C) 2008-2022 The original authors. diff --git a/src/main/resources/antora-resources/antora.yml b/src/main/resources/antora-resources/antora.yml index 5b6e8856f..ea80fd1ea 100644 --- a/src/main/resources/antora-resources/antora.yml +++ b/src/main/resources/antora-resources/antora.yml @@ -13,4 +13,4 @@ asciidoc: spring-framework-javadoc: {springjavadocurl} releasetrainversion: 2023.0.1 # FIXME this is wrong store: Jpa - springhateoasversion: 2.2.0-SNAPSHOT \ No newline at end of file + springhateoasversion: ${spring-hateoas} \ No newline at end of file