From 2390073d67c827eb3d12462c9f6674882106842f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 11 Jun 2024 08:59:18 +0200
Subject: [PATCH] Switch to Antora Maven Plugin, upgrade dependencies.

Closes #226
---
 .gitignore                  |  1 -
 package.json                | 12 ++++++++++++
 playbooks/cassandra.yml     |  9 +--------
 playbooks/commons.yml       |  9 +--------
 playbooks/couchbase.yml     |  9 +--------
 playbooks/elasticsearch.yml |  9 +--------
 playbooks/jpa.yml           |  9 +--------
 playbooks/keyvalue.yml      |  9 +--------
 playbooks/ldap.yml          |  9 +--------
 playbooks/mongodb.yml       |  9 +--------
 playbooks/neo4j.yml         |  9 +--------
 playbooks/redis.yml         |  9 +--------
 playbooks/relational.yml    |  9 +--------
 playbooks/rest.yml          |  9 +--------
 pom.xml                     | 23 ++++++-----------------
 15 files changed, 30 insertions(+), 114 deletions(-)
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 30d37c6..3ccc5ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ build/
 node_modules
 node/
 package-lock.json
-package.json
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..57f7976
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+    "//": "Until it is fixed, force asciidoctor/core version https://github.com/asciidoctor/asciidoctor.js/issues/1732",
+    "dependencies": {
+        "antora": "3.2.0-alpha.4",
+        "@asciidoctor/core": "2.2.6",
+        "@antora/atlas-extension": "1.0.0-alpha.2",
+        "@antora/collector-extension": "1.0.0-alpha.3",
+        "@asciidoctor/tabs": "1.0.0-beta.6",
+        "@springio/antora-extensions": "1.11.1",
+        "@springio/asciidoctor-extensions": "1.0.0-alpha.10"
+    }
+}
diff --git a/playbooks/cassandra.yml b/playbooks/cassandra.yml
index 98d94ad..6e0a143 100644
--- a/playbooks/cassandra.yml
+++ b/playbooks/cassandra.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-cassandra'
 site:
   title: Spring Data for Apache Cassandra
diff --git a/playbooks/commons.yml b/playbooks/commons.yml
index 88cc2b1..4090220 100644
--- a/playbooks/commons.yml
+++ b/playbooks/commons.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-commons'
 site:
   title: Spring Data Commons
diff --git a/playbooks/couchbase.yml b/playbooks/couchbase.yml
index a9f9c84..a9b5453 100644
--- a/playbooks/couchbase.yml
+++ b/playbooks/couchbase.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-couchbase'
 site:
   title: Spring Data Couchbase
diff --git a/playbooks/elasticsearch.yml b/playbooks/elasticsearch.yml
index c96b6f4..2676e2d 100644
--- a/playbooks/elasticsearch.yml
+++ b/playbooks/elasticsearch.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-elasticsearch'
 site:
   title: Spring Data Elasticsearch
diff --git a/playbooks/jpa.yml b/playbooks/jpa.yml
index 4816be9..96b6821 100644
--- a/playbooks/jpa.yml
+++ b/playbooks/jpa.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-jpa'
 site:
   title: Spring Data JPA
diff --git a/playbooks/keyvalue.yml b/playbooks/keyvalue.yml
index ad70959..f4f30fd 100644
--- a/playbooks/keyvalue.yml
+++ b/playbooks/keyvalue.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-keyvalue'
 site:
   title: Spring Data KeyValue
diff --git a/playbooks/ldap.yml b/playbooks/ldap.yml
index 2ca92e7..ffe6f89 100644
--- a/playbooks/ldap.yml
+++ b/playbooks/ldap.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-ldap'
 site:
   title: Spring Data LDAP
diff --git a/playbooks/mongodb.yml b/playbooks/mongodb.yml
index 339b1dc..b03d5e4 100644
--- a/playbooks/mongodb.yml
+++ b/playbooks/mongodb.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-mongodb'
 site:
   title: Spring Data MongoDB
diff --git a/playbooks/neo4j.yml b/playbooks/neo4j.yml
index 9de7221..27f4312 100644
--- a/playbooks/neo4j.yml
+++ b/playbooks/neo4j.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-neo4j'
 site:
   title: Spring Data Neo4j
diff --git a/playbooks/redis.yml b/playbooks/redis.yml
index d3bb00f..c352a5c 100644
--- a/playbooks/redis.yml
+++ b/playbooks/redis.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-redis'
 site:
   title: Spring Data Redis
diff --git a/playbooks/relational.yml b/playbooks/relational.yml
index b2e905d..321ab09 100644
--- a/playbooks/relational.yml
+++ b/playbooks/relational.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-relational'
 site:
   title: Spring Data Relational
diff --git a/playbooks/rest.yml b/playbooks/rest.yml
index ed5b050..ed020ed 100644
--- a/playbooks/rest.yml
+++ b/playbooks/rest.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - 'antora/lib/version-fix.js'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'data-rest'
 site:
   title: Spring Data REST
diff --git a/pom.xml b/pom.xml
index 85d6918..5d98710 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -10,36 +12,23 @@
 	<name>Spring Data Docs Build</name>
 
 	<properties>
-		<io.spring.maven.antora-version>0.0.3</io.spring.maven.antora-version>
+		<maven.antora-version>1.0.0-alpha.4</maven.antora-version>
 		<antora.playbook>playbooks/${spring-data.module}.yml</antora.playbook>
 	</properties>
 
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>io.spring.maven.antora</groupId>
+				<groupId>org.antora</groupId>
 				<artifactId>antora-maven-plugin</artifactId>
-				<version>${io.spring.maven.antora-version}</version>
+				<version>${maven.antora-version}</version>
 				<extensions>true</extensions>
 				<configuration>
-					<playbook>${antora.playbook}</playbook>
 					<options>
 						<option>--to-dir=target/antora/site</option>
 						<option>--stacktrace</option>
 						<option>--fetch</option>
 					</options>
-					<packages>
-						<package>@antora/atlas-extension@v1.0.0-alpha.2</package>
-						<package>@antora/collector-extension@1.0.0-alpha.3</package>
-						<package>@asciidoctor/tabs@1.0.0-beta.3</package>
-						<package>@springio/antora-extensions@1.10.0</package>
-						<package>@springio/asciidoctor-extensions@1.0.0-alpha.10</package>
-					</packages>
-					<environment>
-						<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
-						<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
-						<ALGOLIA_INDEX_NAME>springdocs</ALGOLIA_INDEX_NAME>
-					</environment>
 				</configuration>
 			</plugin>
 		</plugins>