Skip to content

Latest commit

 

History

History
228 lines (148 loc) · 13.5 KB

README.md

File metadata and controls

228 lines (148 loc) · 13.5 KB

Git-Flow Maven Plugin

Maven Central License

The Maven plugin that supports various Git workflows, including Vincent Driessen's successful Git branching model and GitHub Flow.

Currently a Java implementation of Git version control system JGit doesn't support .gitattributes.

This plugin runs Git and Maven commands from the command line ensuring that all Git features work properly.

Changelog

See what's changed - CHANGELOG

Installation

The plugin is available from Maven Central.

<build>
    <plugins>
        <plugin>
            <groupId>com.amashchenko.maven.plugin</groupId>
            <artifactId>gitflow-maven-plugin</artifactId>
            <version>1.8.0</version>
            <configuration>
                <!-- optional configuration -->
            </configuration>
        </plugin>
    </plugins>
</build>

Goals Overview

  • gitflow:release-start - Starts a release branch and updates version(s) to release version.
  • gitflow:release-finish - Merges a release branch and updates version(s) to next development version.
  • gitflow:release - Releases project w/o creating a release branch.
  • gitflow:feature-start - Starts a feature branch and optionally updates version(s).
  • gitflow:feature-finish - Merges a feature branch.
  • gitflow:hotfix-start - Starts a hotfix branch and updates version(s) to hotfix version.
  • gitflow:hotfix-finish - Merges a hotfix branch.
  • gitflow:support-start - Starts a support branch from the production tag.
  • gitflow:help - Displays help information.

Git Workflows

The gitflow-maven-plugin is very versatile. It can be easily configured to use different Git workflows.

GitHub Flow

The GitHub Flow is a lightweight, branch-based workflow that supports teams and projects where deployments are made regularly.

To configure this plugin to use single branch model, such as GitHub Flow, just set the developmentBranch parameter to the same value as the productionBranch in your pom.xml file.

<gitFlowConfig>
    <developmentBranch>master</developmentBranch>
</gitFlowConfig>

That's it!

Eclipse Plugins build with Tycho

Since version 1.1.0 this plugin supports Eclipse plugin projects which are build with Tycho. To enable this feature put <tychoBuild>true</tychoBuild> into <configuration> section of this plugin in your pom.xml file.

Features of tychoBuild

The tycho-versions-plugin Maven plugin will be used to set versions instead of versions-maven-plugin.

Feature name will not be appended to project version on gitflow:feature-start goal even if the skipFeatureVersion is set to false.

If version has qualifier then it will not be removed in the release or hotfix goals.

Plugin Common Parameters

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.

<configuration>
    <mvnExecutable>path_to_maven_executable</mvnExecutable>
    <gitExecutable>path_to_git_executable</gitExecutable>

    <installProject>false</installProject>
    <verbose>false</verbose>

    <gitFlowConfig>
        <productionBranch>master</productionBranch>
        <developmentBranch>develop</developmentBranch>
        <featureBranchPrefix>feature/</featureBranchPrefix>
        <releaseBranchPrefix>release/</releaseBranchPrefix>
        <hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
        <supportBranchPrefix>support/</supportBranchPrefix>
        <versionTagPrefix></versionTagPrefix>
        <origin>origin</origin>
    </gitFlowConfig>

    <commitMessages>
        <!-- since 1.2.1, see Customizing commit messages -->
    </commitMessages>
</configuration>

Customizing commit messages

Since 1.2.1 commit messages can be changed in plugin's configuration section in pom.xml. Commit messages defaults are seen below.

<configuration>
    <commitMessages>
        <featureStartMessage>update versions for feature branch</featureStartMessage>
        <featureFinishMessage>update versions for development branch</featureFinishMessage>
        
        <hotfixStartMessage>update versions for hotfix</hotfixStartMessage>
        <hotfixFinishMessage>update for next development version</hotfixFinishMessage>
        
        <releaseStartMessage>update versions for release</releaseStartMessage>
        <releaseFinishMessage>update for next development version</releaseFinishMessage>
        
        <tagHotfixMessage>tag hotfix</tagHotfixMessage>
        <tagReleaseMessage>tag release</tagReleaseMessage>
    </commitMessages>
</configuration>

Maven properties can be used in commit messages. For example <featureStartMessage>updating ${artifactId} project for feature branch</featureStartMessage> will produce message where ${artifactId} will be substituted for projects <artifactId>.

Note that although ${project.version} can be used, any changes to version introduced by this goal won't be reflected in a commit message for this goal (see Custom properties).

Custom properties in commit messages

@{version} will be replaced with the updated version.

@{featureName} will be replaced in feature- goals with the name of the current feature.

Maven arguments

The argLine parameter can be used to pass command line arguments to the underlying Maven commands. For example, -DcreateChecksum in mvn gitflow:release-start -DargLine=-DcreateChecksum will be passed to all underlying Maven commands.

Additional goal parameters

The gitflow:release-finish, gitflow:release and gitflow:hotfix-finish goals have skipTag parameter. This parameter controls whether the release/hotfix will be tagged in Git. The default value is false (i.e. the release/hotfix will be tagged).

The gitflow:feature-start goal has skipFeatureVersion parameter which controls whether the feature name will be appended to the project version or not. The default value is false (e.g. if the project version is 1.0.0-SNAPSHOT and feature name is feature_name then after the execution it will be 1.0.0-feature_name-SNAPSHOT).

The gitflow:feature-start goal has featureNamePattern parameter which allows to enforce naming of the feature branches with a regular expression. Doesn't have effect if it isn't set or left blank. By default it isn't set.

All -finish goals have keepBranch parameter which controls whether created support branch will be kept in Git after the goal finishes. The default value is false (i.e. the supporting branch will be deleted). If the pushRemote parameter is set to true and keepBranch is false remote branch will be deleted as well.

All -finish goals and gitflow:release have skipTestProject parameter which controls whether Maven test goal will be called before merging branches. The default value is false (i.e. the project will be tested before merging branches).

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).

The gitflow:release-finish and gitflow:release goals have digitsOnlyDevVersion parameter which will remove qualifiers from the next development version if set to true. For example, if the release version is 1.0.0-Final then development version will be 1.0.1-SNAPSHOT. The default value is false (i.e. qualifiers will be preserved in next development version).

The gitflow:release-finish and gitflow:release goals have developmentVersion parameter which can be used to set the next development version in non-interactive mode.

The gitflow:release-finish and gitflow:release goals have versionDigitToIncrement parameter which controls which digit to increment in the next development version. Starts from zero. For example, if the release version is 1.2.3.4 and versionDigitToIncrement is set to 1 then the next development version will be 1.3.0.0-SNAPSHOT. If not set or set to not valid value defaults to increment last digit in the version.

The gitflow:release-start and gitflow:release-finish have commitDevelopmentVersionAtStart parameter which controls whether the next development version is set and committed at start or after finish. By default the value is false which means that the next development version is set on the development branch after the release branch has been merged onto the development branch when finishing the release. This has the benefit of being able to easily cancel the release process simply by deleting the release branch. If the value is true then versioning happens on gitflow:release-start. First the project version is set to the release version on the development branch and the release branch is created. Then the development branch is set to the next development version. This allows the development branch to continue immediately with a new version and helps avoid any future merge conflicts related to project versioning. Has effect only when there are separate development and production branches.

The gitflow:release-start goal have fromCommit parameter which allows to start the release from the specific commit (SHA).

Remote interaction

At the start of the each goal remote branch(es) will be fetched and compared with the local branch(es). If the local branch doesn't exist it will be checked out from the remote. Both of these options 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.

At the end of the -start goals newly created branch (release / feature / hotfix) can be pushed to the remote. This can be achieved by setting pushRemote parameter to true.

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).

Release branch can be merged without --no-ff option by setting releaseMergeNoFF parameter to false. The default value is true (i.e. merge --no-ff will be performed). The releaseMergeNoFF parameter has no effect when releaseRebase parameter is set to true.

Release branch can be merged with --ff-only option by setting releaseMergeFFOnly parameter to true. The default value is false (i.e. The --ff-only option won't be used).

Feature branch can be squashed before merging by setting featureSquash parameter to true. The default value is false (i.e. merge w/o squash will be performed).

Running custom Maven goals

The preReleaseGoals parameter can be used in gitflow:release-finish and gitflow:release goals to run defined Maven goals before the release. E.g. mvn gitflow:release-finish -DpreReleaseGoals=test will run mvn test goal in the release branch before merging into the production branch.

The postReleaseGoals parameter can be used in gitflow:release-finish and gitflow:release goals to run defined Maven goals after the release. E.g. mvn gitflow:release-finish -DpostReleaseGoals=deploy will run mvn deploy goal in the production branch after the release.

The gitflow:hotfix-finish goal have preHotfixGoals and postHotfixGoals parameters which can be used to run defined Maven goals before and after the hotfix respectively.

Non-interactive Release

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.

mvn -B gitflow:release-start gitflow:release-finish

To release w/o creating separate release branch use gitflow:release goal.

mvn -B gitflow:release

This gives the ability to perform releases in non-interactive mode (e.g. in CI server).