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

Update antora on next development version release 

Move commit from gradle task to workflow. Update antora.yml after project version update and before commit.

Closes gh-11021
This commit is contained in:
Eleftheria Stein 2022-03-29 12:25:55 +02:00
parent 4a25264404
commit 992b8c38ac
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,9 @@ jobs:
export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD" export GRADLE_ENTERPRISE_CACHE_PASSWORD="$GRADLE_ENTERPRISE_CACHE_PASSWORD"
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 -Pcommit=true ./gradlew :updateToSnapshotVersion
./gradlew :spring-security-docs:antoraUpdateVersion
git commit -am "Next development version"
git push git push
notify_result: notify_result:
name: Check for failures name: Check for failures

3
buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateProjectVersionPlugin.java
View File

@ -37,8 +37,7 @@ public class UpdateProjectVersionPlugin implements Plugin<Project> {
public void execute(UpdateToSnapshotVersionTask updateToSnapshotVersionTask) { public void execute(UpdateToSnapshotVersionTask updateToSnapshotVersionTask) {
updateToSnapshotVersionTask.setGroup("Release"); updateToSnapshotVersionTask.setGroup("Release");
updateToSnapshotVersionTask.setDescription( updateToSnapshotVersionTask.setDescription(
"Updates the project version to the next snapshot in gradle.properties and optionally commits the changes"); "Updates the project version to the next snapshot in gradle.properties");
updateToSnapshotVersionTask.setCommit("true".equals(project.findProperty("commit")));
} }
}); });
} }

21
buildSrc/src/main/java/org/springframework/security/convention/versions/UpdateToSnapshotVersionTask.java
View File

@ -18,12 +18,9 @@ package org.springframework.security.convention.versions;
import org.gradle.api.DefaultTask; import org.gradle.api.DefaultTask;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.tasks.Input;
import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskAction;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -31,10 +28,6 @@ public abstract class UpdateToSnapshotVersionTask extends DefaultTask {
private static final String RELEASE_VERSION_PATTERN = "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-M\\d+|-RC\\d+)?$"; private static final String RELEASE_VERSION_PATTERN = "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-M\\d+|-RC\\d+)?$";
@Input
@Optional
private Boolean commit;
@TaskAction @TaskAction
public void updateToSnapshotVersion() { public void updateToSnapshotVersion() {
String currentVersion = getProject().getVersion().toString(); String currentVersion = getProject().getVersion().toString();
@ -49,12 +42,6 @@ public abstract class UpdateToSnapshotVersionTask extends DefaultTask {
gradlePropertiesText = gradlePropertiesText.replace("version=" + currentVersion, "version=" + nextVersion); gradlePropertiesText = gradlePropertiesText.replace("version=" + currentVersion, "version=" + nextVersion);
return gradlePropertiesText; return gradlePropertiesText;
}); });
if (this.commit) {
System.out.println("Committing the version update");
File rootDir = getProject().getRootDir();
String commitMessage = "Next development version";
CommandLineUtils.runCommand(rootDir, "git", "commit", "-am", commitMessage);
}
} }
private String calculateNextSnapshotVersion(String currentVersion) { private String calculateNextSnapshotVersion(String currentVersion) {
@ -78,12 +65,4 @@ public abstract class UpdateToSnapshotVersionTask extends DefaultTask {
} }
} }
public Boolean getCommit() {
return commit;
}
public void setCommit(Boolean commit) {
this.commit = commit;
}
} }