From 1f4c1c33d0cdfa766a5664529c38d6a8144415af Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Tue, 18 Jun 2024 15:11:56 -0400
Subject: [PATCH] Upgrading antora ui package and use package.json

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

diff --git a/.gitignore b/.gitignore
index d2b09304..51421d84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,5 @@ _configprops.adoc
 _spans.adoc
 _metrics.adoc
 _conventions.adoc
-package.json
-package-lock.json
\ No newline at end of file
+/package.json
+package-lock.json
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 3e059add..ba807ab9 100644
--- a/docs/antora-playbook.yml
+++ b/docs/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/
@@ -37,4 +30,4 @@ runtime:
     format: pretty
 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
diff --git a/docs/package.json b/docs/package.json
new file mode 100644
index 00000000..c3570e2f
--- /dev/null
+++ b/docs/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/docs/pom.xml b/docs/pom.xml
index c943f41f..397587cf 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -114,7 +114,7 @@
 						<artifactId>antora-component-version-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
+						<groupId>org.antora</groupId>
 						<artifactId>antora-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
diff --git a/pom.xml b/pom.xml
index 958e7251..7e72fa58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,7 @@
 		<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
 		<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
 		<antora-maven-plugin.version>0.0.4</antora-maven-plugin.version>
+		<org-antora-maven-plugin.version>1.0.0-alpha.4</org-antora-maven-plugin.version>
 		<antora-maven-plugin.phase>prepare-package</antora-maven-plugin.phase>
 		<generate-readme.phase>prepare-package</generate-readme.phase>
 		<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
@@ -1066,22 +1067,14 @@
 							</executions>
 						</plugin>
 						<plugin>
-							<groupId>io.spring.maven.antora</groupId>
+							<groupId>org.antora</groupId>
 							<artifactId>antora-maven-plugin</artifactId>
-							<version>${antora-maven-plugin.version}</version>
+							<version>${org-antora-maven-plugin.version}</version>
 							<configuration>
 								<!-- TODO: remove when CI upgrades past ubuntu 1804 -->
 								<node>
 									<version>v16.16.0</version>
 								</node>
-								<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>
-									<package>asciidoctor-kroki@0.17.0</package>
-								</packages>
 							</configuration>
 							<executions>
 								<execution>