From 2da9149728f2fbedfc09009cb1cfb6a75c9df6c8 Mon Sep 17 00:00:00 2001 From: Aleksandr Mashchenko Date: Fri, 30 Sep 2016 18:32:35 +0300 Subject: [PATCH] 1.3.0 release --- CHANGELOG.md | 5 +++++ README.md | 9 ++++++++- pom.xml | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84aff481..98cecbea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v1.3.0 + +* Remote interaction. Added `fetchRemote` and `pushRemote` parameters. +* Updated default executable names (see [#20](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/20)) + ## v1.2.3 * Added `featureSquash` parameter which allows to squash feature commits (see [#17](https://github.com/aleksandr-m/gitflow-maven-plugin/issues/17)) diff --git a/README.md b/README.md index bd5aa172..855648a4 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ If version has qualifier then it will not be removed in the release or hotfix go # Plugin Common Parameters -All parameters are optional. The `gitFlowConfig` parameters defaults are the same as in below example. +All parameters are optional. The `gitFlowConfig` parameters defaults are the same as in the example below. Maven and Git executables are assumed to be in the PATH, if executables are not available in the PATH or you want to use different version use `mvnExecutable` and `gitExecutable` parameters. The `installProject` parameter controls whether the Maven `install` goal will be called during the mojo execution. The default value for this parameter is `false` (i.e. the project will NOT be installed). Since `1.0.7` version of this plugin the output of the executed commands will NOT be printed into the console. This can be changed by setting `verbose` parameter to `true`. @@ -79,6 +79,7 @@ Since `1.0.7` version of this plugin the output of the executed commands will NO hotfix/ support/ + origin @@ -127,6 +128,12 @@ The default value is `false` (i.e. the project will be tested before merging bra All `release` goals have `allowSnapshots` parameter which controls whether SNAPSHOT dependencies are allowed. The default value is `false` (i.e. build fails if there SNAPSHOT dependency in project). +### Remote interaction + +At the start of the each goal remote branch(es) will be fetched and compared with the local branch(es). This can be turned off by setting `fetchRemote` parameter to `false`. +At the end of the `-finish` goals development or production and development branches will be pushed to remote. This can be turned off by setting `pushRemote` parameter to `false`. +The default remote name is `origin`. It can be customized with `custom_origin` configuration in pom.xml. + ### Rebase, Merge, Fast Forward, Squash Release branch can be rebased instead of merged by setting `releaseRebase` parameter to `true`. The default value is `false` (i.e. merge will be performed). diff --git a/pom.xml b/pom.xml index e71574a3..0e6b6d74 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ gitflow-maven-plugin maven-plugin gitflow-maven-plugin - 1.2.4-SNAPSHOT + 1.3.0 Git-Flow Maven Plugin, which runs Git and Maven commands from the command line. Supports Eclipse Plugins build with Tycho.