Spring/spring-data-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not create maintenance branches upon release conclude for branch-only releases.

Browse Source 
Closes #213
This commit is contained in:
Mark Paluch
2022-04-27 09:46:08 +02:00
parent f6f53ab8fe
commit 09b220eeee
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
View File

@@ -143,35 +143,46 @@ class ReleaseCommands extends TimedCommand {
Assert.notNull(iteration, "Train iteration must not be null!");
build.prepareVersions(iteration, Phase.CLEANUP);
git.commit(iteration, "Prepare next development iteration.");
// Prepare main branch
build.updateProjectDescriptors(iteration, Phase.CLEANUP);
git.commit(iteration, "After release cleanups.");
// Tag release
git.tagRelease(iteration);
// Prepare maintenance branches
if (iteration.getIteration().isGAIteration()) {
if (iteration.getTrain().isAlwaysUseBranch()) {
setupMaintenanceVersions(iteration);
} else {
// Create bugfix branches
git.createMaintenanceBranches(iteration);
// Set project version to maintenance once
build.prepareVersions(iteration, Phase.MAINTENANCE);
build.prepareVersions(iteration, Phase.CLEANUP);
git.commit(iteration, "Prepare next development iteration.");
// Update inter-project dependencies and repositories
build.updateProjectDescriptors(iteration, Phase.MAINTENANCE);
// Prepare main branch
build.updateProjectDescriptors(iteration, Phase.CLEANUP);
git.commit(iteration, "After release cleanups.");
// Back to main branch
git.checkout(iteration);
// Prepare maintenance branches
if (iteration.getIteration().isGAIteration()) {
// Create bugfix branches
git.createMaintenanceBranches(iteration);
// Set project version to maintenance once
setupMaintenanceVersions(iteration);
}
}
}
private void setupMaintenanceVersions(TrainIteration iteration) throws Exception {
// Set project version to maintenance once
build.prepareVersions(iteration, Phase.MAINTENANCE);
git.commit(iteration, "Prepare next development iteration.");
// Update inter-project dependencies and repositories
build.updateProjectDescriptors(iteration, Phase.MAINTENANCE);
git.commit(iteration, "After release cleanups.");
// Back to main branch
git.checkout(iteration);
}
/**
* Triggers the distribution of release artifacts for all projects.
*