search

aleksandr-m / gitflow-maven-plugin

The Git-Flow Maven Plugin supports various Git workflows, including GitFlow and GitHub Flow. This plugin runs Git and Maven commands from the command line.
https://aleksandr-m.github.io/gitflow-maven-plugin/
Apache License 2.0
492 stars 182 forks source link

The parameters skipMergeDevBranch and skipMergeProdBranch for hotfix-finish goal are not working #174

Closed nrohankar29 closed 5 years ago

nrohankar29 commented 5 years ago

The parameters skipMergeDevBranch and skipMergeProdBranch for hotfix-finish goal are not working. Take a look at the following output. It is still merging the hotfix branch to master and develop

→ mvn -B gitflow:hotfix-finish -DfetchRemote=false -DhotfixVersion=2.10.5 -DpushRemote=false -DskipMergeDevBranch=true -DskipMergeProdBranch=true
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model for com.reancloud.platform.common:docker-rest-service:jar:2.10.5
[WARNING] 'build.plugins.plugin.version' for org.springframework.boot:spring-boot-maven-plugin is missing. @ line 75, column 12
[WARNING]
[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
[WARNING]
[INFO] GitBranchInfo: [name='', type='UNDEFINED', pattern='null']
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building docker-rest-service 2.10.5
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- gitflow-maven-plugin:1.10.0:hotfix-finish (default-cli) @ docker-rest-service ---
[INFO] Checking for uncommitted changes.
[INFO] Checking out 'hotfix/2.10.5' branch.
[INFO] Cleaning and testing the project.
[INFO] Checking out 'master' branch.
[INFO] Merging (--no-ff) 'hotfix/2.10.5' branch.
[INFO] Creating '2.10.5' tag.
[INFO] Checking out 'develop' branch.
[INFO] Updating version(s) to '2.10.5'.
[INFO] Committing changes.
[INFO] Merging (--no-ff) 'hotfix/2.10.5' branch.
[INFO] Updating version(s) to '2.12.5-SNAPSHOT'.
[INFO] Committing changes.
[INFO] Deleting 'hotfix/2.10.5' branch.
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 15.604 s
[INFO] Finished at: 2019-05-07T15:35:37+05:30
[INFO] Final Memory: 14M/309M
[INFO] ------------------------------------------------------------------------
nrohankar29 commented 5 years ago

Any help would be appriciated.

aleksandr-m commented 5 years ago

@nrohankar29 Use the latest version of the plugin.