...
NOTE: The value of RC_VERSION will vary for each release.
| Code Block |
|---|
git checkout <master -or- maintenance-branch>
git pull
git push origin <master -or- maintenance-branch>:${RC_VERSION}-RC |
Release candidate branches CANNOT have the same version property as the master branch in the pom.xml file. The versions on the master branch will need to be incremented at the same time you create the release branches. You will need to pull in another community member to create a pull request with the version change, or another committer if you are going to create the pull requests yourself.
In this case, you can use the "versions-maven-plugin" to update project version numbers. See versions-maven-plugin documentation. For example:
| Code Block |
|---|
mvn versions:set -DnewVersion= |
| Code Block |
git checkout <master -or- maintenance-branch> git pull git push origin <master -or- maintenance-branch>:${RC_VERSION}-RCSNAPSHOT |
Tag the release candidate branch
...
Push Release Branch to Maintenance
The release branch has changes made since code freeze. It also contains the update to the version numbers for future development.
...
Ensure that your commit history matches the release branch's commit history, except for the two additional commits.
- Changing from SNAPSHOT version to release version. Something like [maven-release-plugin] prepare release $REPO-$CURR
- Changing from release version to next development version. Something like [maven-release-plugin] prepare for next development iteration
...
If this appears correct, you can push your release branch on to the maintenance branch.
...