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

@@ -53,6 +53,7 @@ public class CommitMessages {
     private String updateReleaseBackPreMergeStateMessage;
 
     private String updateFeatureBackMessage;
+    private String featureFinishIncrementVersionMessage;
 
     public CommitMessages() {
         featureStartMessage = "Update versions for feature branch";
@@ -81,6 +82,7 @@ public CommitMessages() {
         updateReleaseBackPreMergeStateMessage = "Update release version back to pre-merge state";
 
         updateFeatureBackMessage = "Update feature branch back to feature version";
+        featureFinishIncrementVersionMessage = "Increment feature version";
     }
 
     /**
@@ -406,4 +408,19 @@ public String getUpdateFeatureBackMessage() {
     public void setUpdateFeatureBackMessage(String updateFeatureBackMessage) {
         this.updateFeatureBackMessage = updateFeatureBackMessage;
     }
+
+    /**
+     * @return the featureFinishIncrementVersionMessage
+     */
+    public String getFeatureFinishIncrementVersionMessage() {
+        return featureFinishIncrementVersionMessage;
+    }
+
+    /**
+     * @param featureFinishIncrementVersionMessage
+     *            the featureFinishIncrementVersionMessage to set
+     */
+    public void setFeatureFinishIncrementVersionMessage(String featureFinishIncrementVersionMessage) {
+        this.featureFinishIncrementVersionMessage = featureFinishIncrementVersionMessage;
+    }
 }

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

@@ -89,6 +89,12 @@ public class GitFlowFeatureFinishMojo extends AbstractGitFlowMojo {
     @Parameter(property = "postFeatureFinishGoals")
     private String postFeatureFinishGoals;
 
+    /**
+     * Whether to increment the version during feature-finish goal.
+     *
+     */
+    @Parameter(property = "incrementVersionAtFinish", defaultValue = "false")
+    private boolean incrementVersionAtFinish;
 
     /** {@inheritDoc} */
     @Override
@@ -138,13 +144,26 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnRun(preFeatureFinishGoals);
             }
 
-            final String currentFeatureVersion = getCurrentProjectVersion();
+            String featureVersion = getCurrentProjectVersion();
 
             final String featName = featureBranchName.replaceFirst(gitFlowConfig.getFeatureBranchPrefix(), "");
 
-            if (currentFeatureVersion.contains("-" + featName)) {
-                final String version = currentFeatureVersion.replaceFirst("-" + featName, "");
+            if (incrementVersionAtFinish) {
+                GitFlowVersionInfo developVersionInfo = new GitFlowVersionInfo(featureVersion);
+                featureVersion = developVersionInfo.nextSnapshotVersion();
+
+                mvnSetVersions(featureVersion);
+
+                Map<String, String> properties = new HashMap<String, String>();
+                properties.put("version", featureVersion);
+                properties.put("featureName", featName);
+                gitCommit(commitMessages.getFeatureFinishIncrementVersionMessage(), properties);
+            }
+
+            final String keptFeatureVersion = featureVersion;
 
+            final String version = keptFeatureVersion.replaceFirst("-" + featName, "");
+            if (keptFeatureVersion.contains("-" + featName)) {
                 // mvn versions:set -DnewVersion=... -DgenerateBackupPoms=false
                 mvnSetVersions(version);
 
@@ -164,8 +183,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 gitMergeSquash(featureBranchName);
                 gitCommit(featureBranchName);
             } else {
+                Map<String, String> properties = new HashMap<String, String>();
+                properties.put("version", version);
+                properties.put("featureName", featName);
                 // git merge --no-ff feature/...
-                gitMergeNoff(featureBranchName, commitMessages.getFeatureFinishDevMergeMessage(), null);
+                gitMergeNoff(featureBranchName, commitMessages.getFeatureFinishDevMergeMessage(), properties);
             }
 
             // maven goals after merge
@@ -181,10 +203,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             if (keepBranch) {
                 gitCheckout(featureBranchName);
 
-                mvnSetVersions(currentFeatureVersion);
+                mvnSetVersions(keptFeatureVersion);
 
                 Map<String, String> properties = new HashMap<String, String>();
-                properties.put("version", currentFeatureVersion);
+                properties.put("version", keptFeatureVersion);
                 properties.put("featureName", featName);
 
                 gitCommit(commitMessages.getUpdateFeatureBackMessage(), properties);