From 36cff22029b0494bcec71c5d3a632f643029173d Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 20 Nov 2023 08:35:45 +0100
Subject: [PATCH] Polishing.

Align Antora playbooks. Add Maven Caching.

See gh-833
---
 .github/workflows/docs-build.yml |  9 +++++++--
 antora-playbook.yml              | 29 +++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
index 0fef95a1..b26098fc 100644
--- a/.github/workflows/docs-build.yml
+++ b/.github/workflows/docs-build.yml
@@ -43,8 +43,13 @@ jobs:
           package.json
           package-lock.json
         key: ${{ runner.os }}-nodejs-${{ hashFiles('pom.xml') }}
+    - name: Cache Maven
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-maven
     - name: Run Antora
-      run: ./mvnw -B antora -Dantora.playbook=playbooks/${{ github.event.inputs.module }}.yml
+      run: ./mvnw -B antora
     - name: Publish Docs
       uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.11
       with:
@@ -54,7 +59,7 @@ jobs:
         docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }}
         site-path: target/antora/site
     - name: Bust Cloudflare Cache
-      uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.11
+      uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.12
       with:
         context-root: spring-vault
         cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }}
diff --git a/antora-playbook.yml b/antora-playbook.yml
index a1e8fb11..aaaa3964 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -1,13 +1,14 @@
 antora:
   extensions:
-  - '@springio/antora-extensions/partial-build-extension'
-  - '@springio/antora-extensions/static-page-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'
-    root_component_name: 'vault'
+    - '@springio/antora-extensions/partial-build-extension'
+    - '@springio/antora-extensions/static-page-extension'
+    - require: '@springio/antora-extensions/latest-version-extension'
+    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
+    - '@antora/collector-extension'
+    - 'antora/lib/version-fix.js'
+    - '@antora/atlas-extension'
+    - require: '@springio/antora-extensions/root-component-extension'
+      root_component_name: 'vault'
 site:
   title: Spring Vault
   url: https://docs.spring.io/spring-vault/reference
@@ -30,17 +31,17 @@ asciidoc:
     hide-uri-scheme: '@'
     tabs-sync-option: '@'
   extensions:
-  - '@asciidoctor/tabs'
-  - '@springio/asciidoctor-extensions'
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
 urls:
   latest_version_segment_strategy: redirect:to
   latest_version_segment: ''
   redirect_facility: httpd
-runtime:
-  log:
-    failure_level: warn
-    format: pretty
 ui:
   bundle:
     url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.7/ui-bundle.zip
     snapshot: true
+runtime:
+  log:
+    failure_level: warn
+    format: pretty