Adding support for merging release into master

[engelkek]

In order for the plugin to support a version of the gitflow plugin we need to merge the release branch back into master. My changes add this functionality. It is enabled by default because I am using these changes in our TeamCity instance.

The changes add two new fields to the release dialog. A checkbox to define whether you want the merge or not and the merge message. Merges are always done as commits, no fast forward.

I hope this might help you in adding the functionality to the official plugin.

[DALDEI]

I ran into this issue trying to debug how the TC/Artifactory plugin works and discovered that the changing of properties for release does not back-propagate to master. https://support.jfrog.com/support/tickets/34774

e.g. if I have a gradle.properties as below and use Artifactory Release Management.

verRelease=3.0
verIntegrate=3.1-SNAPSHOT

Using 'verRelease' as the 'release properties' and 'verIntegrate' as the 'Integration properties' When I run a release build into a branch , the resulting release branch is correct, but the master branch gets out of phase and results in ;

Release branch

verRelease=3.1
verIntegrate=3.1-SNAPSHOT

Master becomes

verRelease=3.0
verIntegrate=3.1-SNAPSHOT

Then on the next release cycle I the versions are all wrong in the dialogs ( still xxx-3.0 ) and I have to hand edit them until I manually edit the build properties. ( otherwise it tries to overwrite the release branch).

Does this change request resolve this problem ? I tried git merge to merge the release branch back to master and (other then the merge conflict on gradle.properties) it resolves the issue. In fact the only thing different from master and release is the properties --

Is an equivalent fix to simply have the properties updated in master correctly ? ( or for gitflow does a merge have to occur rather than a change to master ?)

[eyalbe4]

@engelkek, This pull request is vert old... Would you like us to revisit and possibly collaborate to push it forward?

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

---

Karsten Engelke seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}