From eb2b7f7689cdeaf9db4e2bec923de5a51a2bc97e Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Thu, 23 May 2024 10:19:38 -0500
Subject: [PATCH] Antora updates

---
 .gitignore          |  1 -
 antora-playbook.yml | 11 ++---------
 docs/package.json   | 12 ++++++++++++
 package.json        | 10 ++++++++++
 pom.xml             | 12 ------------
 5 files changed, 24 insertions(+), 22 deletions(-)
 create mode 100644 docs/package.json
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 52aa4071..8d3f129f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,4 @@ src/ant/.ant-targets-upload-dist.xml
 node_modules
 node/
 package-lock.json
-package.json
 .flattened-pom.xml
\ No newline at end of file
diff --git a/antora-playbook.yml b/antora-playbook.yml
index f3c02d52..927252f8 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-build'
-    - '@springio/antora-extensions/static-page-extension'
 site:
   title: Spring Cloud Build
   url: https://docs.spring.io/spring-cloud-build/reference
@@ -38,7 +31,7 @@ urls:
   redirect_facility: httpd
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/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/docs/package.json b/docs/package.json
new file mode 100644
index 00000000..6782b353
--- /dev/null
+++ b/docs/package.json
@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "@antora/atlas-extension": "^1.0.0-alpha.1",
+    "@antora/cli": "^3.2.0-alpha.2",
+    "@antora/collector-extension": "^1.0.0-alpha.3",
+    "@antora/site-generator-default": "^3.2.0-alpha.2",
+    "@asciidoctor/tabs": "^1.0.0-beta.3",
+    "@springio/antora-extensions": "^1.6.0",
+    "@springio/asciidoctor-extensions": "^1.0.0-alpha.9",
+    "asciidoctor-kroki": "^0.17.0"
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..5f2a89d6
--- /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"
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fd7a9c1d..f099627f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,18 +43,6 @@
 						<option>--stacktrace</option>
 						<option>--fetch</option>
 					</options>
-					<environmentVariables>
-						<ALGOLIA_API_KEY>9d489079e5ec46dbb238909fee5c9c29</ALGOLIA_API_KEY>
-						<ALGOLIA_APP_ID>WB1FQYI187</ALGOLIA_APP_ID>
-						<ALGOLIA_INDEX_NAME>springdocs</ALGOLIA_INDEX_NAME>
-					</environmentVariables>
-					<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>