Move featureSquashMessage property to CommitMessages

Author: aleksandr-m

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

@@ -37,6 +37,7 @@ public class CommitMessages {
     private String releaseFinishDevMergeMessage;
 
     private String featureFinishDevMergeMessage;
+    private String featureSquashMessage;
 
     private String hotfixFinishMergeMessage;
     private String hotfixFinishDevMergeMessage;
@@ -75,6 +76,7 @@ public CommitMessages() {
         releaseFinishMergeMessage = System.getProperty("commitMessages.releaseFinishMergeMessage", "");
         releaseFinishDevMergeMessage = System.getProperty("commitMessages.releaseFinishDevMergeMessage", "");
 
+        featureSquashMessage = System.getProperty("commitMessages.featureSquashMessage", "");
         tagHotfixMessage = System.getProperty("commitMessages.tagHotfixMessage", "Tag hotfix");
         tagReleaseMessage = System.getProperty("commitMessages.tagReleaseMessage", "Tag release");
 
@@ -395,6 +397,21 @@ public void setFeatureFinishDevMergeMessage(String featureFinishDevMergeMessage)
         this.featureFinishDevMergeMessage = featureFinishDevMergeMessage;
     }
 
+    /**
+     * @return the featureSquashMessage
+     */
+    public String getFeatureSquashMessage() {
+        return featureSquashMessage;
+    }
+
+    /**
+     * @param featureSquashMessage
+     *            the featureSquashMessage to set
+     */
+    public void setFeatureSquashMessage(String featureSquashMessage) {
+        this.featureSquashMessage = featureSquashMessage;
+    }
+
     /**
      * @return the updateFeatureBackMessage
      */

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

@@ -107,14 +107,6 @@ public class GitFlowFeatureFinishMojo extends AbstractGitFlowMojo {
     @Parameter(property = "incrementVersionAtFinish", defaultValue = "false")
     private boolean incrementVersionAtFinish;
 
-    /**
-     * Commit message to use after squash. Has effect only if {@link #featureSquash}
-     * parameter is set to <code>true</code>.
-     *
-     */
-    @Parameter(property = "featureSquashMessage")
-    private String featureSquashMessage;
-
     /** {@inheritDoc} */
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
@@ -209,7 +201,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             if (featureSquash) {
                 // git merge --squash feature/...
                 gitMergeSquash(featureBranchName);
-                gitCommit(StringUtils.isBlank(featureSquashMessage) ? featureBranchName : featureSquashMessage);
+                gitCommit(StringUtils.isBlank(commitMessages.getFeatureSquashMessage()) ? featureBranchName
+                        : commitMessages.getFeatureSquashMessage());
             } else {
                 Map<String, String> properties = new HashMap<String, String>();
                 properties.put("version", version);