Skip to content

Commit

Permalink
1.3.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksandr-m committed Sep 30, 2016
1 parent d0d17ee commit 2da9149
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -79,6 +79,7 @@ Since `1.0.7` version of this plugin the output of the executed commands will NO
<hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
<supportBranchPrefix>support/</supportBranchPrefix>
<versionTagPrefix></versionTagPrefix>
<origin>origin</origin>
</gitFlowConfig>

<commitMessages>
Expand Down Expand Up @@ -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 `<gitFlowConfig><origin>custom_origin</origin></gitFlowConfig>` 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).
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<artifactId>gitflow-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>gitflow-maven-plugin</name>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0</version>

<description>Git-Flow Maven Plugin, which runs Git and Maven commands from the command line. Supports Eclipse Plugins build with Tycho.</description>

Expand Down

0 comments on commit 2da9149

Please sign in to comment.