From 4d9c91dd2843a4f9f898c48fe532be7af5314f3f Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Wed, 19 Jun 2024 10:01:44 +0200
Subject: [PATCH] Migrate to new Antora infrastructure.

---
 .gitignore          |  1 -
 antora-playbook.yml | 11 ++---------
 package.json        | 12 ++++++++++++
 pom.xml             | 18 +++---------------
 4 files changed, 17 insertions(+), 25 deletions(-)
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 037048b3..d4add6ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,4 @@ pom.xml.releaseBackup
 
 node
 node_modules
-package.json
 package-lock.json
diff --git a/antora-playbook.yml b/antora-playbook.yml
index aaaa3964..f32584b2 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -1,13 +1,6 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - '@springio/antora-extensions/static-page-extension'
-    - require: '@springio/antora-extensions/latest-version-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/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'vault'
 site:
   title: Spring Vault
@@ -39,7 +32,7 @@ urls:
   redirect_facility: httpd
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.7/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
     snapshot: true
 runtime:
   log:
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..57f79762
--- /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/pom.xml b/pom.xml
index 124ce930..1cad918f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,15 +12,15 @@
 	<description>Builds Spring Vault Docs</description>
 
 	<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>
 	</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>
 					<options>
@@ -28,18 +28,6 @@
 						<option>--stacktrace</option>
 						<option>--fetch</option>
 					</options>
-					<packages>
-						<package>@antora/atlas-extension@1.0.0-alpha.1</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.8.0</package>
-						<package>@springio/asciidoctor-extensions@1.0.0-alpha.9</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>