Closes aleksandr-m#8 - Enable to customize commit messages

vsaveliev · Dec 17, 2015 · ecd0b2e · ecd0b2e
1 parent 798d8bb
commit ecd0b2e
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 11 deletions.
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
@@ -63,6 +63,10 @@ public abstract class AbstractGitFlowMojo extends AbstractMojo {
     @Parameter(defaultValue = "${gitFlowConfig}")
     protected GitFlowConfig gitFlowConfig;
 
+    /** Git commit messages. */
+    @Parameter(defaultValue = "${commitMessages}")
+    protected CommitMessages commitMessages;
+
     /** Whether this is Tycho build. */
     @Parameter(defaultValue = "false")
     protected boolean tychoBuild;

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/CommitMessages.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/CommitMessages.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2014-2015 Aleksandr Mashchenko.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.amashchenko.maven.plugin.gitflow;
+
+/**
+ * Git commit messages.
+ * 
+ * @author Aleksandr Mashchenko
+ * 
+ */
+public class CommitMessages {
+    private String featureStartMessage;
+    private String featureFinishMessage;
+
+    private String hotfixStartMessage;
+    private String hotfixFinishMessage;
+
+    private String releaseStartMessage;
+    private String releaseFinishMessage;
+
+    private String tagHotfixMessage;
+    private String tagReleaseMessage;
+
+    public CommitMessages() {
+        featureStartMessage = "updating versions for feature branch";
+        featureFinishMessage = "updating versions for development branch";
+
+        hotfixStartMessage = "updating versions for hotfix";
+        hotfixFinishMessage = "updating for next development version";
+
+        releaseStartMessage = "updating versions for release";
+        releaseFinishMessage = "updating for next development version";
+
+        tagHotfixMessage = "tagging hotfix";
+        tagReleaseMessage = "tagging release";
+    }
+
+    /**
+     * @return the featureStartMessage
+     */
+    public String getFeatureStartMessage() {
+        return featureStartMessage;
+    }
+
+    /**
+     * @param featureStartMessage
+     *            the featureStartMessage to set
+     */
+    public void setFeatureStartMessage(String featureStartMessage) {
+        this.featureStartMessage = featureStartMessage;
+    }
+
+    /**
+     * @return the featureFinishMessage
+     */
+    public String getFeatureFinishMessage() {
+        return featureFinishMessage;
+    }
+
+    /**
+     * @param featureFinishMessage
+     *            the featureFinishMessage to set
+     */
+    public void setFeatureFinishMessage(String featureFinishMessage) {
+        this.featureFinishMessage = featureFinishMessage;
+    }
+
+    /**
+     * @return the hotfixStartMessage
+     */
+    public String getHotfixStartMessage() {
+        return hotfixStartMessage;
+    }
+
+    /**
+     * @param hotfixStartMessage
+     *            the hotfixStartMessage to set
+     */
+    public void setHotfixStartMessage(String hotfixStartMessage) {
+        this.hotfixStartMessage = hotfixStartMessage;
+    }
+
+    /**
+     * @return the hotfixFinishMessage
+     */
+    public String getHotfixFinishMessage() {
+        return hotfixFinishMessage;
+    }
+
+    /**
+     * @param hotfixFinishMessage
+     *            the hotfixFinishMessage to set
+     */
+    public void setHotfixFinishMessage(String hotfixFinishMessage) {
+        this.hotfixFinishMessage = hotfixFinishMessage;
+    }
+
+    /**
+     * @return the releaseStartMessage
+     */
+    public String getReleaseStartMessage() {
+        return releaseStartMessage;
+    }
+
+    /**
+     * @param releaseStartMessage
+     *            the releaseStartMessage to set
+     */
+    public void setReleaseStartMessage(String releaseStartMessage) {
+        this.releaseStartMessage = releaseStartMessage;
+    }
+
+    /**
+     * @return the releaseFinishMessage
+     */
+    public String getReleaseFinishMessage() {
+        return releaseFinishMessage;
+    }
+
+    /**
+     * @param releaseFinishMessage
+     *            the releaseFinishMessage to set
+     */
+    public void setReleaseFinishMessage(String releaseFinishMessage) {
+        this.releaseFinishMessage = releaseFinishMessage;
+    }
+
+    /**
+     * @return the tagHotfixMessage
+     */
+    public String getTagHotfixMessage() {
+        return tagHotfixMessage;
+    }
+
+    /**
+     * @param tagHotfixMessage
+     *            the tagHotfixMessage to set
+     */
+    public void setTagHotfixMessage(String tagHotfixMessage) {
+        this.tagHotfixMessage = tagHotfixMessage;
+    }
+
+    /**
+     * @return the tagReleaseMessage
+     */
+    public String getTagReleaseMessage() {
+        return tagReleaseMessage;
+    }
+
+    /**
+     * @param tagReleaseMessage
+     *            the tagReleaseMessage to set
+     */
+    public void setTagReleaseMessage(String tagReleaseMessage) {
+        this.tagReleaseMessage = tagReleaseMessage;
+    }
+}
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureFinishMojo.java
@@ -118,7 +118,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnSetVersions(version);
 
                 // git commit -a -m updating versions for development branch
-                gitCommit("updating versions for development branch");
+                gitCommit(commitMessages.getFeatureFinishMessage());
             }
 
             if (installProject) {

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureStartMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowFeatureStartMojo.java
@@ -100,7 +100,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     mvnSetVersions(version);
 
                     // git commit -a -m updating versions for feature branch
-                    gitCommit("updating versions for feature branch");
+                    gitCommit(commitMessages.getFeatureStartMessage());
                 }
             }
 

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java
@@ -121,7 +121,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                 // git tag -a ...
                 gitTag(gitFlowConfig.getVersionTagPrefix() + tagVersion,
-                        "tagging hotfix");
+                        commitMessages.getTagHotfixMessage());
             }
 
             // check whether release branch exists
@@ -168,7 +168,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnSetVersions(nextSnapshotVersion);
 
                 // git commit -a -m updating for next development version
-                gitCommit("updating for next development version");
+                gitCommit(commitMessages.getHotfixFinishMessage());
             }
 
             if (installProject) {

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixStartMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixStartMojo.java
@@ -105,7 +105,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnSetVersions(version);
 
                 // git commit -a -m updating versions for hotfix
-                gitCommit("updating versions for hotfix");
+                gitCommit(commitMessages.getHotfixStartMessage());
             }
 
             if (installProject) {

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java
@@ -92,7 +92,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                 // git tag -a ...
                 gitTag(gitFlowConfig.getVersionTagPrefix() + tagVersion,
-                        "tagging release");
+                        commitMessages.getTagReleaseMessage());
             }
 
             // git checkout develop
@@ -123,7 +123,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             mvnSetVersions(nextSnapshotVersion);
 
             // git commit -a -m updating for next development version
-            gitCommit("updating for next development version");
+            gitCommit(commitMessages.getReleaseFinishMessage());
 
             if (installProject) {
                 // mvn clean install

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseMojo.java
@@ -116,7 +116,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnSetVersions(version);
 
                 // git commit -a -m updating versions for release
-                gitCommit("updating versions for release");
+                gitCommit(commitMessages.getReleaseStartMessage());
             }
 
             // git checkout master
@@ -133,7 +133,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                 // git tag -a ...
                 gitTag(gitFlowConfig.getVersionTagPrefix() + version,
-                        "tagging release");
+                        commitMessages.getTagReleaseMessage());
             }
 
             // git checkout develop
@@ -161,7 +161,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             mvnSetVersions(nextSnapshotVersion);
 
             // git commit -a -m updating for next development version
-            gitCommit("updating for next development version");
+            gitCommit(commitMessages.getReleaseFinishMessage());
 
             if (installProject) {
                 // mvn clean install

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java
@@ -123,7 +123,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 mvnSetVersions(version);
 
                 // git commit -a -m updating versions for release
-                gitCommit("updating versions for release");
+                gitCommit(commitMessages.getReleaseStartMessage());
             }
 
             if (installProject) {