From e8307864cfe153afdf44a641cb8b3b9f15d47175 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Mon, 24 Jun 2024 15:58:39 -0400
Subject: [PATCH] Upgrading antora

---
 .gitignore          |  2 +-
 antora-playbook.yml | 11 ++--------
 package.json        | 10 +++++++++
 pom.xml             | 51 ++++++---------------------------------------
 4 files changed, 19 insertions(+), 55 deletions(-)
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 6be8a4a16..360a846b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,5 @@ src/ant/.ant-targets-upload-dist.xml
 node
 node_modules
 build
-package.json
+docs/package.json
 package-lock.json
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 1c1a37cbc..ca5381f24 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -1,14 +1,7 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    # atlas-extension must be before latest-version-extension so latest versions are applied to imported versions
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'cloud-vault'
-    - '@springio/antora-extensions/static-page-extension'
 site:
   title: Spring Cloud Vault
   url: https://docs.spring.io/spring-cloud-vault/reference
@@ -38,7 +31,7 @@ urls:
   redirect_facility: httpd
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.12/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip
     snapshot: true
 runtime:
   log:
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..c3570e2f8
--- /dev/null
+++ b/package.json
@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0-alpha.4",
+    "@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 6ee5695c8..3cd5637df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,13 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-vault-docs-build</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-vault-parent</artifactId>
+		<version>4.1.3-SNAPSHOT</version>
+	</parent>
 
 	<name>Spring Cloud Vault Docs Build</name>
 	<description>Builds Spring Cloud Vault Docs.</description>
@@ -22,56 +26,13 @@
 		<url>https://github.com/spring-cloud/spring-cloud-vault/issues</url>
 	</issueManagement>
 
-	<properties>
-		<io.spring.maven.antora-version>0.0.3</io.spring.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>
-				<extensions>true</extensions>
-				<configuration>
-					<options>
-						<option>--to-dir=target/antora/site</option>
-						<option>--stacktrace</option>
-						<option>--fetch</option>
-					</options>
-					<environment>
-						<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
-						<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
-						<ALGOLIA_INDEX_NAME>springdocs</ALGOLIA_INDEX_NAME>
-					</environment>
-					<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.6.0</package>
-						<package>@springio/asciidoctor-extensions@1.0.0-alpha.9</package>
-					</packages>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>spring-snapshot</id>
-			<url>https://repo.spring.io/snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-		</repository>
-		<repository>
-			<id>spring-milestone</id>
-			<url>https://repo.spring.io/milestone</url>
-		</repository>
-	</repositories>
-
 </project>