1.3.1 release

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.3.1
+
+* Added ability to set version in non interactive mode (see [#25](https://github.com/aleksandr-m/gitflow-maven-plugin/pull/25))
+* Don't merge/tag/fetch/push to the same branch when using single branch model like GitHub Flow (see [#22](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/22))
+
 ## v1.3.0
 
 * Remote interaction. Added `fetchRemote` and `pushRemote` parameters.

README.md

@@ -22,7 +22,7 @@ The plugin is available from Maven Central.
             <plugin>
                 <groupId>com.amashchenko.maven.plugin</groupId>
                 <artifactId>gitflow-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>1.3.1</version>
                 <configuration>
                     <!-- optional configuration -->
                 </configuration>
@@ -110,17 +110,17 @@ Since `1.2.1` commit messages can be changed in plugin's configuration section i
 
     <configuration>
         <commitMessages>
-            <featureStartMessage>updating versions for feature branch</featureStartMessage>
-            <featureFinishMessage>updating versions for development branch</featureFinishMessage>
+            <featureStartMessage>update versions for feature branch</featureStartMessage>
+            <featureFinishMessage>update versions for development branch</featureFinishMessage>
             
-            <hotfixStartMessage>updating versions for hotfix</hotfixStartMessage>
-            <hotfixFinishMessage>updating for next development version</hotfixFinishMessage>
+            <hotfixStartMessage>update versions for hotfix</hotfixStartMessage>
+            <hotfixFinishMessage>update for next development version</hotfixFinishMessage>
             
-            <releaseStartMessage>updating versions for release</releaseStartMessage>
-            <releaseFinishMessage>updating for next development version</releaseFinishMessage>
+            <releaseStartMessage>update versions for release</releaseStartMessage>
+            <releaseFinishMessage>update for next development version</releaseFinishMessage>
             
-            <tagHotfixMessage>tagging hotfix</tagHotfixMessage>
-            <tagReleaseMessage>tagging release</tagReleaseMessage>
+            <tagHotfixMessage>tag hotfix</tagHotfixMessage>
+            <tagReleaseMessage>tag release</tagReleaseMessage>
         </commitMessages>
     </configuration>
 
@@ -162,8 +162,8 @@ Feature branch can be squashed before merging by setting `featureSquash` paramet
 
 # Non-interactive Release
 
-Releases could be performed without prompting for the release version during `gitflow:release-start` goal by telling Maven to run in non-interactive (batch) mode.
-When `gitflow:release-start` is executed in the Maven batch mode the default release version will be used.
+Releases could be performed without prompting for the release version during `gitflow:release-start` or `gitflow:release` goals by telling Maven to run in non-interactive (batch) mode.
+The `releaseVersion` parameter can be used to set the release version in non-interactive mode. If `releaseVersion` parameter is not set then the default release version will be used.
 
 To put Maven in the batch mode use `-B` or `--batch-mode` option.
 

pom.xml

@@ -21,7 +21,7 @@
     <artifactId>gitflow-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>gitflow-maven-plugin</name>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
 
     <description>The Git-Flow Maven Plugin supports various Git workflows, including Vincent Driessen's successful Git branching model and GitHub Flow. This plugin runs Git and Maven commands from the command line. Supports Eclipse Plugins build with Tycho.</description>