From 24e925ef4d0bda1a7b656cf578e004febcf72a6f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 31 Oct 2022 15:25:11 +0000 Subject: [PATCH 1/5] Release 5.7.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a4bd842653..67e4c3e4d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=5.3.23 openSamlVersion=3.4.6 -version=5.7.5-SNAPSHOT +version=5.7.5 kotlinVersion=1.6.21 samplesBranch=5.7.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError From 60f44b347f4af4c56ba897723881ad5a40af0b23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 31 Oct 2022 15:33:06 +0000 Subject: [PATCH 2/5] Release 5.6.9 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ed30ed55e9..7c3196c15a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=5.3.23 openSamlVersion=3.4.6 -version=5.6.9-SNAPSHOT +version=5.6.9 kotlinVersion=1.5.32 samplesBranch=5.6.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError From ef41b8c2f281e45afac87a24d63843a74bcef1e9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 31 Oct 2022 16:11:44 +0000 Subject: [PATCH 3/5] Next development version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7c3196c15a..f30d788560 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=5.3.23 openSamlVersion=3.4.6 -version=5.6.9 +version=5.6.10-SNAPSHOT kotlinVersion=1.5.32 samplesBranch=5.6.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError From 92c1281a56370b59a2b9f2b16ab38d8d7db8cd9d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 31 Oct 2022 16:35:14 +0000 Subject: [PATCH 4/5] Next development version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 67e4c3e4d3..64ae4c5c42 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ springJavaformatVersion=0.0.31 springBootVersion=2.4.2 springFrameworkVersion=5.3.23 openSamlVersion=3.4.6 -version=5.7.5 +version=5.7.6-SNAPSHOT kotlinVersion=1.6.21 samplesBranch=5.7.x org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError From e9db852d6edb83075c9c8d77782ce9f2b31cb962 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Tue, 25 Oct 2022 17:37:41 -0600 Subject: [PATCH 5/5] 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