From be901ec53abb454d30bc16c1d509a08e6cd65636 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Mon, 24 Jun 2024 11:22:04 -0400
Subject: [PATCH] Upgrading antora
---
.gitignore | 2 +-
docs/antora-playbook.yml | 10 ++--------
docs/package.json | 10 ++++++++++
docs/pom.xml | 3 ++-
4 files changed, 15 insertions(+), 10 deletions(-)
create mode 100644 docs/package.json
diff --git a/.gitignore b/.gitignore
index d0e84b87..1c04a60b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,5 @@ consul_*.zip.*
node
node_modules
build
-package.json
+/package.json
package-lock.json
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index 5ecdfafc..db37c487 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-consul'
- - '@springio/antora-extensions/static-page-extension'
site:
title: Spring Cloud Consul
url: https://docs.spring.io/spring-cloud-consul/reference/
@@ -36,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..be7a0c4a
--- /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 574d4beb..4926acb8 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -67,7 +67,7 @@
antora-component-version-maven-plugin
- io.spring.maven.antora
+ org.antora
antora-maven-plugin
@@ -75,6 +75,7 @@
maven-antrun-plugin
+ org.apache.maven.plugins
maven-deploy-plugin