From 68f714917b3e9b6bcb0a079d4e8f12a451ea7bae Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Wed, 2 Aug 2023 11:04:13 -0500
Subject: [PATCH] Use io.spring.maven.antora plugins.

- Switch to io.spring.maven.antora plugins
- Move Antora to spring-data-jpa modulen. Placing in parent folder
  means that each module will also have the Antora plugin applied to it
  and the antora task will fail on those modules.

See #3094
---
 pom.xml                                       | 98 +------------------
 spring-data-jpa/pom.xml                       | 24 +++++
 .../src}/main/antora/antora-playbook.yml      |  4 +-
 .../src}/main/antora/antora.yml               |  4 +-
 .../src}/main/antora/modules/ROOT/nav.adoc    |  0
 .../antora/modules/ROOT/pages/envers.adoc     |  0
 .../main/antora/modules/ROOT/pages/faq.adoc   |  0
 .../antora/modules/ROOT/pages/glossary.adoc   |  0
 .../main/antora/modules/ROOT/pages/index.adoc |  0
 .../main/antora/modules/ROOT/pages/jpa.adoc   |  0
 .../modules/ROOT/pages/jpa/auditing.adoc      |  0
 .../ROOT/pages/jpa/entity-persistence.adoc    |  0
 .../modules/ROOT/pages/jpa/introduction.adoc  |  0
 .../pages/jpa/jpd-misc-cdi-integration.adoc   |  0
 .../modules/ROOT/pages/jpa/locking.adoc       |  0
 .../modules/ROOT/pages/jpa/misc-context.adoc  |  0
 .../jpa/misc-merging-persistence-units.adoc   |  0
 .../ROOT/pages/jpa/query-by-example.adoc      |  0
 .../modules/ROOT/pages/jpa/query-methods.adoc |  0
 .../ROOT/pages/jpa/specifications.adoc        |  0
 .../ROOT/pages/jpa/stored-procedures.adoc     |  0
 .../modules/ROOT/pages/jpa/transactions.adoc  |  0
 .../resources/antora-resources/antora.yml     |  3 +-
 23 files changed, 31 insertions(+), 102 deletions(-)
 rename {src => spring-data-jpa/src}/main/antora/antora-playbook.yml (93%)
 rename {src => spring-data-jpa/src}/main/antora/antora.yml (50%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/nav.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/envers.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/faq.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/glossary.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/index.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/auditing.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/entity-persistence.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/introduction.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/jpd-misc-cdi-integration.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/locking.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/misc-context.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/misc-merging-persistence-units.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/query-by-example.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/query-methods.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/specifications.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/stored-procedures.adoc (100%)
 rename {src => spring-data-jpa/src}/main/antora/modules/ROOT/pages/jpa/transactions.adoc (100%)
 rename {src/main => spring-data-jpa/src/main/antora}/resources/antora-resources/antora.yml (86%)

diff --git a/pom.xml b/pom.xml
index b709f1f03a..d63ed1c14b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,16 +42,6 @@
 
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
-		<!-- Antora -->
-		<node.version>v18.12.1</node.version>
-		<npm.version>8.19.2</npm.version>
-		<antora.version>3.2.0-alpha.2</antora.version>
-		<antora-atlas.version>1.0.0-alpha.1</antora-atlas.version>
-		<antora-collector.version>1.0.0-alpha.3</antora-collector.version>
-		<asciidoctor-tabs.version>1.0.0-beta.3</asciidoctor-tabs.version>
-		<spring-antora-extensions.version>1.4.0</spring-antora-extensions.version>
-		<spring-asciidoctor-extensions.version>1.0.0-alpha.9</spring-asciidoctor-extensions.version>
-
 	</properties>
 
 	<modules>
@@ -117,93 +107,6 @@
 				<eclipselink>4.0.2</eclipselink>
 			</properties>
 		</profile>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.eirslett</groupId>
-						<artifactId>frontend-maven-plugin</artifactId>
-						<version>1.12.1</version>
-						<executions>
-							<execution>
-								<id>install-antora</id>
-								<goals>
-									<goal>install-node-and-npm</goal>
-								</goals>
-								<phase>initialize</phase>
-								<configuration>
-									<nodeVersion>${node.version}</nodeVersion>
-									<npmVersion>${npm.version}</npmVersion>
-								</configuration>
-							</execution>
-							<execution>
-								<id>npm install antora</id>
-								<goals>
-									<goal>npm</goal>
-								</goals>
-								<phase>initialize</phase>
-								<configuration>
-									<arguments>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}</arguments>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-						<version>3.0.0</version>
-						<executions>
-							<execution>
-								<id>antora</id>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<phase>compile</phase>
-								<configuration>
-									<!-- If we don't want to depend on default node installation path we can use a maven
-                                     property aligned with frontend-maven-plugin's installDirectory configuration -->
-									<executable>node/node</executable>
-									<arguments>
-										<argument>node_modules/.bin/antora</argument>
-										<argument>src/main/antora/antora-playbook.yml</argument>
-										<argument>--to-dir=target/site</argument>
-									</arguments>
-									<workingDirectory>${project.parent.basedir}</workingDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-clean-plugin</artifactId>
-						<version>3.1.0</version>
-						<configuration>
-							<filesets>
-								<fileset>
-									<directory>node</directory>
-									<followSymlinks>false</followSymlinks>
-								</fileset>
-								<fileset>
-									<directory>node_modules</directory>
-									<followSymlinks>false</followSymlinks>
-								</fileset>
-								<fileset>
-									<directory>build</directory>
-									<followSymlinks>false</followSymlinks>
-								</fileset>
-							</filesets>
-						</configuration>
-					</plugin>
-				</plugins>
-				<resources>
-					<resource>
-						<directory>src/main/resources</directory>
-						<filtering>true</filtering>
-					</resource>
-				</resources>
-			</build>
-		</profile>
 	</profiles>
 
 	<dependencyManagement>
@@ -304,6 +207,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 
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 @@
 
 	<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>
@@ -430,6 +431,29 @@
 				</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>
 
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: