Update to Antora 3.0.0

spring-projects · Jan 5, 2022 · 96e5e67 · 96e5e67
1 parent d5483f7
commit 96e5e67
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 49 deletions.
diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml
@@ -21,8 +21,7 @@ ui:
     url: https://github.com/spring-io/antora-ui-spring/releases/download/latest/ui-bundle.zip
     snapshot: true
 
-pipeline:
+antora:
   extensions:
     - require: ./antora/extensions/version-fix.js
     - require: ./antora/extensions/major-minor-segment.js
-    - require: ./antora/extensions/root-component-name.js
diff --git a/docs/antora/extensions/major-minor-segment.js b/docs/antora/extensions/major-minor-segment.js
@@ -3,8 +3,8 @@
 
 const { posix: path } = require('path')
 
-module.exports.register = (pipeline, { config }) => {
-    pipeline.on('contentClassified', ({ contentCatalog }) => {
+module.exports.register = function({ config }) {
+    this.on('contentClassified', ({ contentCatalog }) => {
         contentCatalog.getComponents().forEach(component => {
             const componentName = component.name;
             const generationToVersion = new Map();
@@ -197,4 +197,4 @@ function no_data(key, value) {
         return value ? "__data__" : value;
     }
     return value;
-}
+}
diff --git a/docs/antora/extensions/root-component-name.js b/docs/antora/extensions/root-component-name.js
diff --git a/docs/antora/extensions/version-fix.js b/docs/antora/extensions/version-fix.js
@@ -2,9 +2,8 @@
 'use strict'
 
 
-module.exports.register = (pipeline, { config }) => {
-
-    pipeline.on('contentAggregated', ({ contentAggregate }) => {
+module.exports.register = function({ config }) {
+    this.on('contentAggregated', ({ contentAggregate }) => {
         contentAggregate.forEach(aggregate => {
             if (aggregate.name === "" && aggregate.displayVersion === 5.6) {
                 aggregate.name = "ROOT";

diff --git a/docs/spring-security-docs.gradle b/docs/spring-security-docs.gradle
@@ -7,7 +7,7 @@ apply plugin: 'io.spring.convention.docs'
 apply plugin: 'java'
 
 antora {
-	antoraVersion = "3.0.0-alpha.8"
+	antoraVersion = "3.0.0"
 	arguments = ["--fetch", "--stacktrace"]
 }