diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml index ec4e8a7a68..c3058059cc 100644 --- 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 index eec0764544..3c3761f923 100644 --- 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; -} \ No newline at end of file +} diff --git a/docs/antora/extensions/root-component-name.js b/docs/antora/extensions/root-component-name.js deleted file mode 100644 index dcc8dc482c..0000000000 --- a/docs/antora/extensions/root-component-name.js +++ /dev/null @@ -1,40 +0,0 @@ -// https://gitlab.com/antora/antora/-/issues/132#note_712132072 -'use strict' - -const { posix: path } = require('path') - -module.exports.register = (pipeline, { config }) => { - pipeline.on('contentClassified', ({ contentCatalog }) => { - const rootComponentName = config.rootComponentName || 'ROOT' - const rootComponentNameLength = rootComponentName.length - contentCatalog.findBy({ component: rootComponentName }).forEach((file) => { - if (file.out) { - file.out.dirname = file.out.dirname.substr(rootComponentNameLength) - file.out.path = file.out.path.substr(rootComponentNameLength + 1) - file.out.rootPath = fixPath(file.out.rootPath) - } - if (file.pub) { - file.pub.url = file.pub.url.substr(rootComponentNameLength + 1) - if (file.pub.rootPath) { - file.pub.rootPath = fixPath(file.pub.rootPath) - } - } - if (file.rel) { - if (file.rel.pub) { - file.rel.pub.url = file.rel.pub.url.substr(rootComponentNameLength + 1) - file.rel.pub.rootPath = fixPath(file.rel.pub.rootPath); - } - } - }) - const rootComponent = contentCatalog.getComponent(rootComponentName) - rootComponent?.versions?.forEach((version) => { - version.url = version.url.substr(rootComponentName.length + 1) - }) - // const siteStartPage = contentCatalog.getById({ component: '', version: '', module: '', family: 'alias', relative: 'index.adoc' }) - // if (siteStartPage) delete siteStartPage.out - }) - - function fixPath(path) { - return path.split('/').slice(1).join('/') || '.' - } -} \ No newline at end of file diff --git a/docs/antora/extensions/version-fix.js b/docs/antora/extensions/version-fix.js index fb12473521..b0208d25d7 100644 --- 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 index 5b04b0446e..1d15793b66 100644 --- 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"] }