From e8ac26f9173848bfed9ea0d52e53d03bb2a2458e Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 12 Feb 2016 15:28:40 +0100 Subject: [PATCH] #10 - Make sure maintenance branches are only created for GA releases. --- .../data/release/cli/ReleaseCommands.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java index 49848dd..7fdf91d 100644 --- a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java +++ b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java @@ -132,12 +132,16 @@ public class ReleaseCommands implements CommandMarker { git.commit(iteration, "After release cleanups."); // Prepare maintenance branches - git.checkout(iteration); - git.createMaintenanceBranches(iteration); + if (iteration.getIteration().isGAIteration()) { - build.updateProjectDescriptors(iteration, Phase.MAINTENANCE); - build.prepareVersions(iteration, Phase.MAINTENANCE); - git.commit(iteration, "Prepare next development iteration."); + git.createMaintenanceBranches(iteration); + + build.updateProjectDescriptors(iteration, Phase.MAINTENANCE); + build.prepareVersions(iteration, Phase.MAINTENANCE); + git.commit(iteration, "Prepare next development iteration."); + + git.checkout(iteration); + } } /**