Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.8.x'

This commit is contained in:
Josh Cummings 2022-10-17 15:01:30 -06:00
parent 3d92e22891 cfb7c87dfd
commit f2ddeaface
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/continuous-integration-workflow.yml vendored
View File

@ -271,7 +271,6 @@ jobs:
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY" export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
echo "Updating $REPO@$VERSION to next snapshot version." echo "Updating $REPO@$VERSION to next snapshot version."
./gradlew :updateToSnapshotVersion ./gradlew :updateToSnapshotVersion
./gradlew :spring-security-docs:antoraUpdateVersion
git commit -am "Next development version" git commit -am "Next development version"
git push git push
perform_post_release: perform_post_release:

4
docs/spring-security-docs.gradle
View File

@ -38,7 +38,9 @@ tasks.register('generateAntora') {
.join('\n') .join('\n')
def outputFile = layout.buildDirectory.file('generateAntora/antora.yml').get().asFile def outputFile = layout.buildDirectory.file('generateAntora/antora.yml').get().asFile
mkdir(outputFile.getParentFile()) mkdir(outputFile.getParentFile())
def (mainVersion, prerelease) = project.version.split(/(?=-)/, 2) def components = project.version.split(/(?=-)/)
def mainVersion = components[0];
def prerelease = components.length > 1 ? components[1] : null
def antoraYmlText = file('antora.yml').text def antoraYmlText = file('antora.yml').text
layout.buildDirectory.file('.antora.yml').get().asFile.text = antoraYmlText layout.buildDirectory.file('.antora.yml').get().asFile.text = antoraYmlText
antoraYmlText = antoraYmlText.lines().collect { l -> antoraYmlText = antoraYmlText.lines().collect { l ->