Skip to content

Add release line extension #12078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion antora-playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ antora:
- ./lib/antora/extensions/inject-collector-config.js
- '@antora/collector-extension'
- ./lib/antora/extensions/version-fix.js
- ./lib/antora/extensions/major-minor-segment.js
- '@opendevise/antora-release-line-extension'
site:
title: Spring Security
url: https://docs.spring.io/spring-security/reference
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ antora {
'ALGOLIA_INDEX_NAME': 'security-docs'
]
dependencies = [
'@antora/collector-extension': '1.0.0-alpha.2'
'@antora/collector-extension': '1.0.0-alpha.2',
'@opendevise/antora-release-line-extension': '1.0.0-alpha.1'
]
}
204 changes: 0 additions & 204 deletions lib/antora/extensions/major-minor-segment.js

This file was deleted.

53 changes: 18 additions & 35 deletions lib/antora/extensions/version-fix.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,22 @@
// https://gitlab.com/antora/antora/-/issues/132#note_712132072
'use strict'


module.exports.register = function({ config }) {
this.on('contentAggregated', ({ contentAggregate }) => {
contentAggregate.forEach(aggregate => {
if (aggregate.name === "" && aggregate.displayVersion === 5.6) {
aggregate.name = "ROOT";
aggregate.version = "5.6.0-RC1"
aggregate.startPage = "ROOT:index.adoc"
aggregate.displayVersion = `${aggregate.version}`
aggregate.prerelease = true
}
else if (aggregate.version === "5.6.1" &&
aggregate.prerelease == "-SNAPSHOT") {
aggregate.version = "5.6.1"
aggregate.displayVersion = `${aggregate.version}`
aggregate.prerelease = true
}
else if (aggregate.prerelease && aggregate.prerelease != true) {
aggregate.version += aggregate.prerelease
aggregate.prerelease = true
}
})
module.exports.register = function () {
this.once('contentAggregated', ({ contentAggregate }) => {
contentAggregate.forEach((componentVersionBucket) => {
if (componentVersionBucket.prerelease === 'true') componentVersionBucket.prerelease = true
if (!componentVersionBucket.name && componentVersionBucket.displayVersion === '5.6') {
componentVersionBucket.name = 'ROOT'
componentVersionBucket.version = '5.6.0-RC1'
delete componentVersionBucket.displayVersion
componentVersionBucket.prerelease = true
}
else if (componentVersionBucket.version === '5.6.1') {
delete componentVersionBucket.prerelease
}
else if (typeof componentVersionBucket.prerelease === 'string' && componentVersionBucket.prerelease !== '-SNAPSHOT') {
componentVersionBucket.version += componentVersionBucket.prerelease
componentVersionBucket.prerelease = true
}
})
}

function out(args) {
console.log(JSON.stringify(args, no_data, 2));
}


function no_data(key, value) {
if (key == "data" || key == "files") {
return value ? "__data__" : value;
}
return value;
})
}