Here is a solution to the following problems

  • Deriving Maven artifact version from GIT branch,
  • Update pom version on GIT checkout automatically,
  • Add the ability to use Pull request with Maven" target="_blank">Apache Maven.

You have a workflow requirement that require you to have the artifact version of a module externally defined from the current branch in GIT.

For example

You want to start working on a new feature branch “feature-memory-improvement”, so you branch from master a new branch named feature/feature-memory-improvement

Having unique snapshot is a something you need to share your code using a Maven repository, so you may want to have into the branch all pom.xml version changed to

<version>FEATURE-MEMORY-IMPROVEMENT-SNAPHOTS</version>

changing all your pom.xml and doing a technical commit&160; will create merge conflicts when using pull request!

One solution, while not perfect is to do the following:&160; You can add a separate execution to run a goal which will change the version of the POM automatically in the Maven reactor. This small script will do it¨

Create a TeamCity Command line Build Step with a custom script (Linux Bash)

echo 'Change the version in pom.xml files...'
branch=$(git rev-parse --abbrev-ref HEAD)


version="$branch-SNAPSHOT"
# OPTIONNAL: filter out any eventual Branch prefixes
# e.g. /bugfix /feature /release version="$(echo $version | sed 's/bugfix\///g')" version="$(echo $version | sed 's/feature \///g')"
version="$(echo $version | sed 's/release \///g')"
# OPTIONNAL: make pom version all uppercase
version="${version^^}" mvn versions:set -DgenerateBackupPoms=false -DnewVersion="$version" echo 'Changed version in pom.xml files to ${version}' exit 0

What is changing?

You do not have anymore to make pom version unique in your feature branch and commit pom version as they will change on the fly according to the branch name. You can now enjoy pull request in Atlassian Stash or GitHub Enterprise.

pom.xml all stay to MASTER-SNAPSHOT in all branches

Soon I will show you hot to do this using a server side GIT hook in Atlassian Stash and with a client side GIT hook.

Note about Branch prefixes

Use the prefixes below as part of your branch names to categorize them and take advantage of automatic branching workflows

These are the conventions I am using, Atlassian Bitbucket propose them as default

  • bugfix/ Typically used for fixing bugs against a release branch
  • feature/ Used for specific feature work. Typically, this branches from and merges back into the development branch
  • hotfix/ Typically used to quickly fix the production branch
  • release/ Used for release tasks and long-term maintenance. Typically, this branches from the development branch and changes are merged back into the development branch
  • Thanks to these articles for the idea.

    comments powered by Disqus

    You might like also

    Fetching artifact programmatically through REST/API in Nexus 3.x
    There is so many case where it is desirable to pull down artifact from Sonatype Nexus using REST API, unfortunately Nexus 3.x Rest API are still under development... Some use cases in Nexus 2.x: You have a script that uses REST call to pull down the LATEST maven artifacts every night from Nexus and deploys them. You make extensive use of the REST API in all your puppet modules You use the Atlassian Puppet module for Nexus for creating repository, …
    201 Days ago
    git-branch-renamer-maven-plugin
    When working with many feature/release/bugix/hotfix branches, it is a bad idea to start changing the pom version as this will create merge conflicts using pull request. this plugin allow you to keep in ALL branches the same pom version for all your projects, for example MASTER-SNAPSHOT the version will be derived from branch name automagically :-) You may want to read more first these 2 short articles Update Maven pom version on GIT checkout in TeamCity maven-release-plugin with GIT git-branch-renamer-maven-plugin …
    213 Days ago
    Review: Getting Started with Apache Maven by Russell Gold
    Some time ago I was asked if I would like to write a review about one of the new video courses from Packt Publishing. It was "Getting Started with Apache Maven" http://bit.ly/1fycmpP by Russell Gold and since I have been using Maven for some years now (since 2007) and did publish some articles myself, I thought it would be nice to help them promote Apache Maven. The course is organized in eight chapters, forty videos with a length between two …
    1400 Days ago
    Easily Compress Web Application Resources with EhCache
    Resources such as JavaScript and CSS files can be compressed before being sent to the browser, improving network efficiencies and application load time in certain case. If you are not using Apache with mod_deflate or nginx in front of your web application, you may need to implement resources compression yourself…. Wait! don’t start writing your own filter to compress files like CSS, html, txt, javascript it is way more difficult than you think to properly handle http response headers and …
    1887 Days ago
    Tomcat 7 and Apache Maven
    Here is 3 different way to control the lifetime a local Tomcat 7 container using Apache Maven. A typical scenario would be to start a servlet container prior to running integration tests (Selenium, SAHI or using any other framework you can think of ) With the following examples, you will be able to start an instance of Tomcat 7 running your web application in the pre-integration-test phase and stop the instance in the post-integration-test phase. You can also decide to …
    1887 Days ago
    Apache Maven copy local file to a remote server server using SSH
    I will show you in an Apache Maven configuration file how to copy files to server each time the package phase is executed. Solution with Ant SCP task This snippet of code is a ready to use code that make use of Apache Ant task scp, Just put this snippet of code in your Maven module where the assembly is executed or anywhere else to push all tar.gz files to a server just run a maven mvn package, you can …
    2075 Days ago
    Apache M2Eclipse: Get rid of Duplicate resources when opening resources and types
    In this small post, I’ll show you how to remove duplicated resources in the Open Resource view of Eclipse Eclipse – M2Eclipse – Subversive …
    2081 Days ago
    Apache Maven 3 Cookbook
    &160; First a big thanks to Packt Publishing for having sent me this book to review! I did enjoy going through this book, while I did not learn a lot of new stuff (I am using Apache Maven daily since 2006!), I found it to be concise and would recommend it anytime to any of my colleagues. But let’s go through my review of this cookbook of over 50 recipes towards optimal Java Software Engineering with Maven 3: Apache Maven
    2223 Days ago
    Apache Maven 3 Cookbook Review
    Thanks to Packt Publishing for having sent me this book to review. I will publish a review in the next coming days Grasp the fundamentals and extend Apache Maven 3 to meet your needs Implement engineering practices in your application development process with Apache Maven Collaboration techniques for Agile teams with Apache Maven Use Apache Maven with Java, Enterprise Frameworks, and various other cutting-edge technologies Develop for Google Web Toolkit, Google App Engine, and Android Platforms using Apache Maven You …
    2269 Days ago
    List conflicting dependencies in the Maven reactor
    The Maven Dependency Plugin among other things include a dependency:analyze-duplicate The dependency plugin provides the capability to manipulate artifacts. It can copy and/or unpack artifacts from local or remote repositories to a specified location. This Apache Maven plugin is really feature rich and provide a lot of interesting goals: …
    2385 Days ago