From cc82e2d0d99c78f5fffb874ab337e2724a523e78 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <omaciaszeksh@vmware.com>
Date: Fri, 12 Jul 2024 19:58:12 +0200
Subject: [PATCH] Upgrade Antora.

---
 .github/workflows/deploy-docs.yml |  2 +-
 .gitignore                        |  2 +-
 antora-playbook.yml               | 11 ++---------
 package.json                      | 11 +++++++++++
 pom.xml                           | 32 ++++++++-----------------------
 5 files changed, 23 insertions(+), 35 deletions(-)
 create mode 100644 package.json

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 93c1da37e1..4bd7d8207b 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -36,7 +36,7 @@ jobs:
           echo BUILD_VERSION=$BUILD_VERSION >> $GITHUB_ENV
       - name: Run Antora
         run: |
-          ./mvnw --no-transfer-progress -B antora
+          ./mvnw --no-transfer-progress -B antora -Pdocs
       - name: Publish Docs
         uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.13
         with:
diff --git a/.gitignore b/.gitignore
index 6be8a4a166..360a846b6a 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 ed54a5469b..2814a970f7 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-kubernetes'
-    - '@springio/antora-extensions/static-page-extension'
 site:
   title: Spring Cloud Kubernetes
   url: https://docs.spring.io/spring-cloud-kubernetes/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/package.json b/package.json
new file mode 100644
index 0000000000..0b5838a227
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+  "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",
+    "asciidoctor-kroki": "0.18.1"
+  }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 42ae93a275..9742f3d3a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,14 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-kubernetes-docs-build</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>${parent.version}</version>
+
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-kubernetes</artifactId>
+		<version>3.1.4-SNAPSHOT</version>
+	</parent>
 
 	<name>Spring Cloud Kubernetes Docs Build</name>
 	<description>Builds Spring Cloud Kubernetes Docs.</description>
@@ -30,29 +35,8 @@
 	<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>