Saturday, September 24, 2016

♕ Keep Calm We're Moving To Gitflow GitFlow + Maven = No Joy ☹

I've have my own custom Jenkins that contains some basic configuration to build a tiny library called lyeung-common-test.

I've been trying to get GitFlow to work as a proof of concept.

I've played around with different plugins but to get GitFlow and Maven to work together proves more challenging than I initially thought.

The fundamental problem seems to be the pom version. Maven standard practice requires the version number to be defined upfront. However, when GitFlow comes in and starts merging branches, I get merge conflicts on version numbers.

Little Johnny is not a happy boy...