From ce12b75f7add9b3227bdddd0ce88d05fe5c613aa Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:00:14 -0400
Subject: [PATCH] Upgrading antora
---
.gitignore | 2 +-
docs/antora-playbook.yml | 11 ++---------
docs/package.json | 12 ++++++++++++
docs/pom.xml | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
create mode 100644 docs/package.json
diff --git a/.gitignore b/.gitignore
index 9b40b235..97e6dae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,5 @@ _site/
node
node_modules
build
-package.json
+/package.json
package-lock.json
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
index ffdab656..b219c806 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-circuitbreaker'
- - '@springio/antora-extensions/static-page-extension'
site:
title: Spring Cloud Circuitbreaker
url: https://docs.spring.io/spring-cloud-circuitbreaker/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..2bd9d95b
--- /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/docs/pom.xml b/docs/pom.xml
index 29dfe259..011966f2 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -69,7 +69,7 @@
antora-component-version-maven-plugin
- io.spring.maven.antora
+ org.antora
antora-maven-plugin