Repository: apex-site Updated Branches: refs/heads/master 52c6b53ec -> f57518807
Update release instructions. Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/f5751880 Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/f5751880 Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/f5751880 Branch: refs/heads/master Commit: f5751880732ca3c0813ff11032cec27b6126a165 Parents: 52c6b53 Author: Thomas Weise <[email protected]> Authored: Sat Nov 26 17:23:33 2016 -0800 Committer: Thomas Weise <[email protected]> Committed: Sat Nov 26 17:23:33 2016 -0800 ---------------------------------------------------------------------- src/md/release.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-site/blob/f5751880/src/md/release.md ---------------------------------------------------------------------- diff --git a/src/md/release.md b/src/md/release.md index 669a06a..48320a0 100644 --- a/src/md/release.md +++ b/src/md/release.md @@ -31,12 +31,16 @@ mvn versions:set -DnewVersion=${rv} -Pall-modules ``` Commit and push the change: ``` -git commit -am "Preparing for 3.5.0 development" +git commit --author "Apex Dev <[email protected]>" -am "Preparing for 3.5.0 development" git push apache master ``` ## Preparing Release Candidate +``` +git checkout release-3.4 +``` + ### Add missing @since tags For Java classes added since the last release, the @since tags need to be added. The javadoc plugin inserts missing tags, but does not play well with the license header when no class level documentation block is present. This is tracked as @@ -66,7 +70,7 @@ Example: http://s.apache.org/8uT Commit tags and change log: ``` -git commit -am "Add @since tags and update change log for release 3.4.0" +git commit --author "Apex Dev <[email protected]>" -am "Add @since tags and update change log for release 3.4.0" ``` ### Update version number for RC @@ -85,7 +89,7 @@ mvn versions:set -Pall-modules -DnewVersion=${rv} ``` Commit version change: ``` -git commit -am "Preparing to release ${rv}-RC1" +git commit --author "Apex Dev <[email protected]>" -am "Preparing to release ${rv}-RC1" git tag -a "v${rv}-RC1" -m "Release ${rv}-RC1" ``` Push to fork (as temporary branch), open pull request, wait for Travis CI build to succeed. Then push the tag. @@ -196,7 +200,7 @@ git checkout asf-site rm -rf docs/${DOC_NAME}-${docv} cp -r ../${REPO_NAME}/site docs/${DOC_NAME}-${docv} git add -A -git commit -m "Adding ${DOC_NAME}-${rv} documentation" +git commit --author "Apex Dev <[email protected]>" -m "Adding ${DOC_NAME}-${rv} documentation" git push ``` @@ -248,7 +252,7 @@ published libraries. Commit all changes and push them to the remote git repository: ```bash -git commit -am "Preparing for 3.4.1 development" +git commit --author "Apex Dev <[email protected]>" -am "Preparing for 3.4.1 development" git push apache ``` Merge `@since` tag and change log changes to `master`. @@ -265,7 +269,7 @@ cd docs # Set the release version to be the latest available version ln -nsf ${DOC_NAME}-${docv} ${DOC_NAME} git add -A -git commit -m "Promoting ${DOC_NAME}-${docv} documentation" +git commit --author "Apex Dev <[email protected]>" -m "Promoting ${DOC_NAME}-${docv} documentation" git push ```
