Merge remote-tracking branch 'origin/5.7.x' into 5.8.x
This commit is contained in:
commit
cfb7c87dfd
|
@ -271,7 +271,6 @@ jobs:
|
|||
export GRADLE_ENTERPRISE_ACCESS_KEY="$GRADLE_ENTERPRISE_SECRET_ACCESS_KEY"
|
||||
echo "Updating $REPO@$VERSION to next snapshot version."
|
||||
./gradlew :updateToSnapshotVersion
|
||||
./gradlew :spring-security-docs:antoraUpdateVersion
|
||||
git commit -am "Next development version"
|
||||
git push
|
||||
perform_post_release:
|
||||
|
|
|
@ -38,7 +38,9 @@ tasks.register('generateAntora') {
|
|||
.join('\n')
|
||||
def outputFile = layout.buildDirectory.file('generateAntora/antora.yml').get().asFile
|
||||
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
|
||||
layout.buildDirectory.file('.antora.yml').get().asFile.text = antoraYmlText
|
||||
antoraYmlText = antoraYmlText.lines().collect { l ->
|
||||
|
|
Loading…
Reference in New Issue