From 87039484a9ed615d6d1eb46dbb5be3ca3e4e4f29 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:23:25 -0400
Subject: [PATCH] Upgrading antora

---
 .gitignore                               |  2 +-
 docs/antora-playbook.yml                 | 10 ++--------
 docs/modules/ROOT/partials/appProps.adoc |  2 +-
 docs/package.json                        | 11 +++++++++++
 docs/pom.xml                             |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 docs/package.json

diff --git a/.gitignore b/.gitignore
index b36bfbc292..ff9afd346c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,5 @@ dependency-reduced-pom.xml
 node
 node_modules
 build
-package.json
+/package.json
 package-lock.json
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 8224f60376..7bfaa60737 100644
--- a/docs/antora-playbook.yml
+++ b/docs/antora-playbook.yml
@@ -1,13 +1,7 @@
 antora:
   extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
+    - require: '@springio/antora-extensions'
       root_component_name: 'cloud-contract'
-    - '@springio/antora-extensions/static-page-extension'
 site:
   title: Spring Cloud Contract
   url: https://docs.spring.io/spring-cloud-contract/reference/
@@ -38,4 +32,4 @@ runtime:
     format: pretty
 ui:
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.11/ui-bundle.zip
\ No newline at end of file
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.15/ui-bundle.zip
diff --git a/docs/modules/ROOT/partials/appProps.adoc b/docs/modules/ROOT/partials/appProps.adoc
index 189a4437dd..e8be5b1b43 100644
--- a/docs/modules/ROOT/partials/appProps.adoc
+++ b/docs/modules/ROOT/partials/appProps.adoc
@@ -6,8 +6,8 @@
 |APPLICATION_USERNAME|Optional username to access the application.|
 |MESSAGING_TRIGGER_CONNECT_TIMEOUT|Timeout to connect to the application to trigger a message.|5000
 |MESSAGING_TRIGGER_READ_TIMEOUT|Timeout to read the response from the application to trigger a message.|5000
-|MESSAGING_TYPE|Defines the messaging type when dealing with message based contracts.|
 |MESSAGING_TYPE|Type of messaging. Can be either [rabbit] or [kafka].|
+|MESSAGING_TYPE|Defines the messaging type when dealing with message based contracts.|
 |SPRING_KAFKA_BOOTSTRAP_SERVERS|For Kafka - brokers addresses.|
 |SPRING_RABBITMQ_ADDRESSES|For RabbitMQ - brokers addresses.|
 |===
\ No newline at end of file
diff --git a/docs/package.json b/docs/package.json
new file mode 100644
index 0000000000..557d9f1743
--- /dev/null
+++ b/docs/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"
+  }
+}
diff --git a/docs/pom.xml b/docs/pom.xml
index d0d3674c01..7698908364 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -158,7 +158,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>