From 8ac34bf11b2cb39029281afe84fcbcbe86031b69 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 21 Aug 2023 11:11:19 +0200
Subject: [PATCH] Use Antora-configuration profiles.

Switch from local plugin definition to the one provided by Spring Data Build.

Closes #2912
---
 pom.xml                                       | 32 ++++++++-----------
 src/main/antora/antora.yml                    |  4 +--
 .../resources/antora-resources/antora.yml     |  9 +++---
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index f483f6a42..565738b5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,6 @@
 		<xmlbeam>1.4.24</xmlbeam>
 		<java-module-name>spring.data.commons</java-module-name>
 		<kotlin.api.target>1.8</kotlin.api.target>
-		<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
 	</properties>
 
 	<dependencies>
@@ -364,27 +363,24 @@
 			<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>
 
+	<profiles>
+		<profile>
+			<id>antora-process-resources</id>
+			<build>
+				<resources>
+					<resource>
+						<directory>src/main/antora/resources/antora-resources</directory>
+						<filtering>true</filtering>
+					</resource>
+				</resources>
+			</build>
+		</profile>
+	</profiles>
+
 	<repositories>
 		<repository>
 			<id>spring-snapshot</id>
diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml
index a80e24aad..f48c7417a 100644
--- a/src/main/antora/antora.yml
+++ b/src/main/antora/antora.yml
@@ -6,7 +6,7 @@ nav:
 ext:
   collector:
     - run:
-        command: mvnw process-resources
+        command: ./mvnw validate process-resources -am -Pantora-process-resources
         local: true
       scan:
-        dir: target/classes/antora-resources
+        dir: target/classes/antora-resources/
diff --git a/src/main/antora/resources/antora-resources/antora.yml b/src/main/antora/resources/antora-resources/antora.yml
index 1c3c07b42..c44892391 100644
--- a/src/main/antora/resources/antora-resources/antora.yml
+++ b/src/main/antora/resources/antora-resources/antora.yml
@@ -1,17 +1,18 @@
 version: ${antora-component.version}
 prerelease: ${antora-component.prerelease}
+
 asciidoc:
   attributes:
     attribute-missing: 'warn'
     chomp: 'all'
     version: ${project.version}
-    springversionshort: 6.1
+    springversionshort: ${spring.short}
     springversion: ${spring}
-    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/data-commons/docs/{version}/api/
     springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
     spring-framework-docs: '{springdocsurl}'
     springjavadocurl: https://docs.spring.io/spring-framework/docs/{springversion}/javadoc-api
     spring-framework-javadoc: '{springjavadocurl}'
-    releasetrainversion: 2023.0.1 # FIXME this is wrong
+    releasetrainversion: ${releasetrain}
     store: Jpa
-    springhateoasversion: ${spring-hateoas}
\ No newline at end of file
+    springhateoasversion: ${spring-hateoas}