From 80877a998388909ac39a450c765b22355d2ecd6b Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:18:40 -0400
Subject: [PATCH] Upgrading antora
---
.gitignore | 2 +-
docs/antora-playbook.yml | 11 ++---------
docs/package.json | 10 ++++++++++
docs/pom.xml | 2 +-
4 files changed, 14 insertions(+), 11 deletions(-)
create mode 100644 docs/package.json
diff --git a/.gitignore b/.gitignore
index 54d2c05795..183cd90a30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,5 @@ IntelliJ_Spring_Boot_Java_Conventions.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 211d7063ed..71b1dcfdc8 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-config'
- - '@springio/antora-extensions/static-page-extension'
site:
title: Spring Cloud Config
url: https://docs.spring.io/spring-cloud-config/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 0000000000..be7a0c4acc
--- /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 2d50b386c5..d4e6359653 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -90,7 +90,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>