Avoid version update commit in develop - closes #226

Author: aleksandr-m

src/main/java/com/amashchenko/maven/plugin/gitflow/CommitMessages.java

@@ -52,6 +52,8 @@ public class CommitMessages {
     private String updateReleaseToAvoidConflictsMessage;
     private String updateReleaseBackPreMergeStateMessage;
 
+    private String updateFeatureBackMessage;
+
     public CommitMessages() {
         featureStartMessage = "Update versions for feature branch";
         featureFinishMessage = "Update versions for development branch";
@@ -77,6 +79,8 @@ public CommitMessages() {
 
         updateReleaseToAvoidConflictsMessage = "Update release to hotfix version to avoid merge conflicts";
         updateReleaseBackPreMergeStateMessage = "Update release version back to pre-merge state";
+
+        updateFeatureBackMessage = "Update feature branch back to feature version";
     }
 
     /**
@@ -387,4 +391,19 @@ public String getFeatureFinishDevMergeMessage() {
     public void setFeatureFinishDevMergeMessage(String featureFinishDevMergeMessage) {
         this.featureFinishDevMergeMessage = featureFinishDevMergeMessage;
     }
+
+    /**
+     * @return the updateFeatureBackMessage
+     */
+    public String getUpdateFeatureBackMessage() {
+        return updateFeatureBackMessage;
+    }
+
+    /**
+     * @param updateFeatureBackMessage
+     *            the updateFeatureBackMessage to set
+     */
+    public void setUpdateFeatureBackMessage(String updateFeatureBackMessage) {
+        this.updateFeatureBackMessage = updateFeatureBackMessage;
+    }
 }

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureFinishMojo.java

@@ -138,27 +138,12 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnRun(preFeatureFinishGoals);
             }
 
-            // git checkout develop
-            gitCheckout(gitFlowConfig.getDevelopmentBranch());
+            final String currentFeatureVersion = getCurrentProjectVersion();
 
-            if (featureSquash) {
-                // git merge --squash feature/...
-                gitMergeSquash(featureBranchName);
-                gitCommit(featureBranchName);
-            } else {
-                // git merge --no-ff feature/...
-                gitMergeNoff(featureBranchName, commitMessages.getFeatureFinishDevMergeMessage(), null);
-            }
-
-            // get current project version from pom
-            final String currentVersion = getCurrentProjectVersion();
+            final String featName = featureBranchName.replaceFirst(gitFlowConfig.getFeatureBranchPrefix(), "");
 
-            final String featName = featureBranchName
-                    .replaceFirst(gitFlowConfig.getFeatureBranchPrefix(), "");
-
-            if (currentVersion.contains("-" + featName)) {
-                final String version = currentVersion
-                        .replaceFirst("-" + featName, "");
+            if (currentFeatureVersion.contains("-" + featName)) {
+                final String version = currentFeatureVersion.replaceFirst("-" + featName, "");
 
                 // mvn versions:set -DnewVersion=... -DgenerateBackupPoms=false
                 mvnSetVersions(version);
@@ -171,6 +156,18 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 gitCommit(commitMessages.getFeatureFinishMessage(), properties);
             }
 
+            // git checkout develop
+            gitCheckout(gitFlowConfig.getDevelopmentBranch());
+
+            if (featureSquash) {
+                // git merge --squash feature/...
+                gitMergeSquash(featureBranchName);
+                gitCommit(featureBranchName);
+            } else {
+                // git merge --no-ff feature/...
+                gitMergeNoff(featureBranchName, commitMessages.getFeatureFinishDevMergeMessage(), null);
+            }
+
             // maven goals after merge
             if (StringUtils.isNotBlank(postFeatureFinishGoals)) {
                 mvnRun(postFeatureFinishGoals);
@@ -181,10 +178,24 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnCleanInstall();
             }
 
+            if (keepBranch) {
+                gitCheckout(featureBranchName);
+
+                mvnSetVersions(currentFeatureVersion);
+
+                Map<String, String> properties = new HashMap<String, String>();
+                properties.put("version", currentFeatureVersion);
+                properties.put("featureName", featName);
+
+                gitCommit(commitMessages.getUpdateFeatureBackMessage(), properties);
+            }
+
             if (pushRemote) {
                 gitPush(gitFlowConfig.getDevelopmentBranch(), false);
 
-                if (!keepBranch) {
+                if (keepBranch) {
+                    gitPush(featureBranchName, false);
+                } else {
                     gitPushDelete(featureBranchName);
                 }
             }