From e9db852d6edb83075c9c8d77782ce9f2b31cb962 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Tue, 25 Oct 2022 17:37:41 -0600 Subject: [PATCH] update generateAntora task to keep prerelease segment other than -SNAPSHOT in docs version --- docs/spring-security-docs.gradle | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/docs/spring-security-docs.gradle b/docs/spring-security-docs.gradle index 842d3ba684..708a22542f 100644 --- a/docs/spring-security-docs.gradle +++ b/docs/spring-security-docs.gradle @@ -38,14 +38,22 @@ tasks.register('generateAntora') { .join('\n') def outputFile = layout.buildDirectory.file('generateAntora/antora.yml').get().asFile mkdir(outputFile.getParentFile()) - def components = project.version.split(/(?=-)/) - def mainVersion = components[0]; - def prerelease = components.length > 1 ? components[1] : null + def mainVersion = project.version + def prerelease = null + def versionComponents = mainVersion.split(/(?=-)/) + if (versionComponents.length > 1) { + if (versionComponents[1] == '-SNAPSHOT') { + mainVersion = versionComponents[0] + prerelease = "'-SNAPSHOT'" + } else { + prerelease = 'true' + } + } def antoraYmlText = file('antora.yml').text layout.buildDirectory.file('.antora.yml').get().asFile.text = antoraYmlText antoraYmlText = antoraYmlText.lines().collect { l -> if (l.startsWith('version: ')) { - return prerelease == null ? "version: '${mainVersion}'" : "version: '${mainVersion}'\nprerelease: '${prerelease}'" + return prerelease == null ? "version: '${mainVersion}'" : "version: '${mainVersion}'\nprerelease: ${prerelease}" } if (l.startsWith('title: ')) return "title: ${project.parent.description}" return l == 'ext:' || l.getAt(0) == ' ' ? null : l