Skip to content
rdelbru edited this page Nov 30, 2012 · 2 revisions

Steps

Final Release

  1. Ensure that everything is committed and pushed on the release-x.x branch
  2. Use the Maven release plugin to update the pom's versions, commit and push.
$ mvn release:update-versions -DautoVersionSubmodules=true
$ git commit -a -m "Bumped version for release"
$ git push
  1. Tag the release branch and push
$ git tag -a x.x
$ git push --tags
  1. Synchronise master branch with changes made in the release-x.x branch
$ git checkout master
$ git merge release-x.x
$ git push
  1. Synchronise develop branch with changes made in the release-x.x branch
$ git checkout develop
$ git merge release-x.x

This step may well lead to a merge conflict (probably even, since we have changed the version number). If so, fix it and commit. 6. Remove release-x.x branch

$ git branch -d release-1.0
$ git push origin :release-1.0

References