...
For fcrepo4/fcrepo4 and fcrepo4-exts/fcrepo-camel, manually add links to the current releases. The easiest way to do this is to search for an old version number and copy/update for the current release.
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.
| Code Block |
|---|
git checkout ${CURR}-RC # this is your local copy of the release branch
git log |
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
| Info |
|---|
| fcrepo-vagrant is an exception to the above rule. The master branch of fcrepo4-exts/fcrepo-vagrant is tied to the last full release version. So you don'tupdate the Fedora version to the new SNAPSHOT version but instead leave it at the just released (${CURR}) version. |
If this appears correct, you can push your release branch on to the maintenance branch.
| Code Block |
|---|
git push origin ${CURR}-RC:${CURR}-maintenance |
| Info |
|---|
Because there are no changes to master after code freeze and all bug fixes are on the ${CURR}-RC branch, this will operate as a fast-forward merge. |
Troubleshooting
| Expand | |||||||||
|---|---|---|---|---|---|---|---|---|---|
|
...