You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/07/10 15:14:11 UTC
isis-site git commit: ISIS-1162: new docs for github-pr.sh
Repository: isis-site
Updated Branches:
refs/heads/asf-site e6efa0930 -> e426c85ca
ISIS-1162: new docs for github-pr.sh
Project: http://git-wip-us.apache.org/repos/asf/isis-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis-site/commit/e426c85c
Tree: http://git-wip-us.apache.org/repos/asf/isis-site/tree/e426c85c
Diff: http://git-wip-us.apache.org/repos/asf/isis-site/diff/e426c85c
Branch: refs/heads/asf-site
Commit: e426c85caf15b41fe3432fa16b72c0c501eeda69
Parents: e6efa09
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jul 10 13:45:13 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jul 10 13:45:13 2015 +0100
----------------------------------------------------------------------
content/guides/cg.html | 387 +++++++++++++------
.../images/committers/github-pr-history.png | Bin 0 -> 20047 bytes
2 files changed, 265 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis-site/blob/e426c85c/content/guides/cg.html
----------------------------------------------------------------------
diff --git a/content/guides/cg.html b/content/guides/cg.html
index 822ef36..996b0ad 100644
--- a/content/guides/cg.html
+++ b/content/guides/cg.html
@@ -2557,12 +2557,149 @@ bundle install</code></pre>
<p>This chapter provides guidance for Apache Isis' own committers.</p>
</div>
<div class="sect2">
-<h3 id="_cg_committers_recreating-an-archetype">10.1. Recreating an Archetype</h3>
+<h3 id="_cg_committers_merging-a-pull-request">10.1. Merging a Pull Request</h3>
+<div class="paragraph">
+<p>The process for merging in github pull requests (so that they can be tested locally before committing) has been scripted in the <code>github-pr.sh</code> script.</p>
+</div>
+<div class="paragraph">
+<p>The script will merge the fork into a temporary branch, and then run a build. Once you are happy, you can commit.</p>
+</div>
+<div class="paragraph">
+<p>The overall process is as follows:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>locate/raise JIRA ticket, eg ISIS-1162</p>
+</li>
+<li>
+<p>checkout branch from which PR was forked (usually just 'master')</p>
+</li>
+<li>
+<p>merge PR into temporary branch using the <code>github-pr.sh</code> script</p>
+</li>
+<li>
+<p>test the change locally (run the app, rebuild, manual regression tests etc)</p>
+</li>
+<li>
+<p>if required, tidy up/refactor code as required</p>
+</li>
+<li>
+<p>merge temporary branch into mainline, and commit</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">github-pr.sh isis 1162 31</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>where
+* <code>isis</code> is the JIRA project and repo
+* <code>1162</code> is the JIRA ticket number
+* <code>31</code> is the gthub PR issue number</p>
+</div>
+<div class="sect3">
+<h4 id="_prerequisites">10.1.1. Prerequisites</h4>
+<div class="paragraph">
+<p>The script uses 'jq' to parse JSON. To install:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>on Linux:<br></p>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">aptitude install jq</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p>on MacOS:<br></p>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">brew install jq</code></pre>
+</div>
+</div>
+</li>
+<li>
+<p>on Windows:<br></p>
+<div class="paragraph">
+<p>Download exe from <a href="http://stedolan.github.io/jq/download/">website</a></p>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_example_transcript">10.1.2. Example transcript</h4>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">$ sh github-pr.sh isis 1162 31
+
+Found JIRA ticket
+Found github PR
+branch_name_local: master
+username : sebadiaz
+repo_full_name : sebadiaz/isis
+repo_clone_url : https://github.com/sebadiaz/isis.git
+branch_name_fork : master
+
+merging into: ISIS-1162_pr-31
+
+Deleting branch 'ISIS-1162_pr-31'
+Deleted branch ISIS-1162_pr-31 (was bd2e3c2).
+Creating the branch ISIS-1162_pr-31
+Switched to a new branch 'ISIS-1162_pr-31'
+Pulling the changes from https://github.com/sebadiaz/isis.git master
+From https://github.com/sebadiaz/isis
+ * branch master -> FETCH_HEAD
+Auto-merging core/pom.xml
+Merge made by the 'recursive' strategy.
+ core/pom.xml | 3 +-
+ .../apache/isis/security/shiro/IsisLdapRealm.java | 198 +++++++++++++++++++--
+ 2 files changed, 186 insertions(+), 15 deletions(-)
+
+Merged the PR; hit enter to build</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The build now commences. Once done, the script continues:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="bash">If build successful and happy to merge, execute:
+
+git checkout master && git merge --no-ff ISIS-1162_pr-31 && git branch -d ISIS-1162_pr-31</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The screenshot belows shows the history we end up with:</p>
+</div>
+<div class="imageblock">
+<div class="content">
+<a class="image" href="images/committers/github-pr-history.png"><img src="images/committers/github-pr-history.png" alt="github pr history"></a>
+</div>
+</div>
+<div class="paragraph">
+<p>This shows the fork being merged into the temporary branch ("ISIS-1162_pr-31"), then some further tidy-up, and finally the merging of the temporary branch into mainline.</p>
+</div>
+<div class="paragraph">
+<p>Note that there is no rebasing in this model. This is intentional: when the merged branch is pushed, github will automatically close the original pull request.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_cg_committers_recreating-an-archetype">10.2. Recreating an Archetype</h3>
<div class="paragraph">
<p>Apache Isis archetypes are reverse engineered from example applications. Once reverse engineered, the source is checked into git (replacing any earlier version of the archetype) and released.</p>
</div>
<div class="sect3">
-<h4 id="_setup_environment_variables">10.1.1. Setup environment variables</h4>
+<h4 id="_setup_environment_variables">10.2.1. Setup environment variables</h4>
<div class="paragraph">
<p>To recreate the <strong>simpleapp</strong> archetype:</p>
</div>
@@ -2588,7 +2725,7 @@ env | grep ISIS | sort</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_check_the_example_app">10.1.2. Check the example app</h4>
+<h4 id="_check_the_example_app">10.2.2. Check the example app</h4>
<div class="paragraph">
<p>Make sure you are in the correct directory, and update the parent <code>pom.xml</code> to reference the <em>released</em> version of Apache Isis core:</p>
</div>
@@ -2964,7 +3101,7 @@ git fetch</code></pre>
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_cutting-a-release">10.2. Cutting a Release</h3>
+<h3 id="_cg_committers_cutting-a-release">10.3. Cutting a Release</h3>
<div class="paragraph">
<p>This page details the process for formally releasing Isis modules.</p>
</div>
@@ -2977,7 +3114,7 @@ git fetch</code></pre>
<p>See also the <a href="#_cg_committers_release-checklist">release checklist</a> for keeping track of where you are while releasing Apache Isis component(s).</p>
</div>
<div class="sect3">
-<h4 id="_intro">10.2.1. Intro</h4>
+<h4 id="_intro">10.3.1. Intro</h4>
<div class="paragraph">
<p>Apache Isis consists of two separately releasable modules. Relative to the root of the
<a href="https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=tree">source code repo</a>, these are:</p>
@@ -2999,7 +3136,7 @@ currently no plan to release this component.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_process_prerequisites">10.2.2. Process Prerequisites</h4>
+<h4 id="_process_prerequisites">10.3.2. Process Prerequisites</h4>
<div class="paragraph">
<p>Before releasing <code>core</code>, ensure there is consensus on the <a href="../support.html">dev mailing list</a> that this is the right
time for a release. The discussion should include confirming the version number to be used, and to confirm content.</p>
@@ -3168,7 +3305,7 @@ git pull --ff-only</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_set_environment_variables">10.2.3. Set Environment Variables</h4>
+<h4 id="_set_environment_variables">10.3.3. Set Environment Variables</h4>
<div class="paragraph">
<p>If you are releasing <code>core</code>:</p>
</div>
@@ -3188,7 +3325,7 @@ env | grep ISIS | sort</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_code_prerequisites">10.2.4. Code Prerequisites</h4>
+<h4 id="_code_prerequisites">10.3.4. Code Prerequisites</h4>
<div class="paragraph">
<p>{note
Unless otherwise stated, you should assume that all remaining steps should be performed in the base directory of the module being released.
@@ -3479,7 +3616,7 @@ licenses to remove from supplemental-models.xml (are spurious):
</div>
</div>
<div class="sect3">
-<h4 id="_sanity_check">10.2.5. Sanity check</h4>
+<h4 id="_sanity_check">10.3.5. Sanity check</h4>
<div class="paragraph">
<p>Before you cut the release, perform one last sanity check on the codebase.</p>
</div>
@@ -3535,7 +3672,7 @@ licenses to remove from supplemental-models.xml (are spurious):
</div>
</div>
<div class="sect3">
-<h4 id="_commit_changes">10.2.6. Commit changes</h4>
+<h4 id="_commit_changes">10.3.6. Commit changes</h4>
<div class="paragraph">
<p>Before going any further, remember to commit any changes from the preceding steps:</p>
</div>
@@ -3546,7 +3683,7 @@ licenses to remove from supplemental-models.xml (are spurious):
</div>
</div>
<div class="sect3">
-<h4 id="_preparing_a_release_code_mvn_release_prepare_code">10.2.7. Preparing a Release (<code>mvn release:prepare</code>)</h4>
+<h4 id="_preparing_a_release_code_mvn_release_prepare_code">10.3.7. Preparing a Release (<code>mvn release:prepare</code>)</h4>
<div class="paragraph">
<p>Most of the work is done using the <code>mvn release:prepare</code> goal. Since this makes a lot of changes, we run it first in "dry run" mode; only if that works do we run the goal for real.</p>
</div>
@@ -3681,7 +3818,7 @@ What is the release version for "Apache Isis Core"? (org.apache.isis.c
</div>
</div>
<div class="sect3">
-<h4 id="_upload_release_for_voting">10.2.8. Upload Release for Voting</h4>
+<h4 id="_upload_release_for_voting">10.3.8. Upload Release for Voting</h4>
<div class="paragraph">
<p>Once the release has been built locally, it should be uploaded for voting. This is done by deploying the Maven artifacts to a staging directory (this includes the source release ZIP file which will be voted upon).</p>
</div>
@@ -3861,7 +3998,7 @@ git fetch</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_voting">10.2.9. Voting</h4>
+<h4 id="_voting">10.3.9. Voting</h4>
<div class="paragraph">
<p>Once the artifacts have been uploaded, you can call a vote.</p>
</div>
@@ -3930,7 +4067,7 @@ Please verify the release and cast your vote. The vote will be open for a minim
</div>
</div>
<div class="sect3">
-<h4 id="_after_the_vote">10.2.10. After the vote</h4>
+<h4 id="_after_the_vote">10.3.10. After the vote</h4>
<div class="paragraph">
<p>Once the vote has completed, post the results to the isis-dev mailing list.</p>
</div>
@@ -4059,7 +4196,7 @@ git fetch</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_promoting_release_to_distribution">10.2.11. Promoting Release to Distribution</h4>
+<h4 id="_promoting_release_to_distribution">10.3.11. Promoting Release to Distribution</h4>
<div class="sect4">
<h5 id="_release_binaries_to_maven_central_repo">Release Binaries to Maven Central Repo</h5>
<div class="paragraph">
@@ -4119,7 +4256,7 @@ git fetch</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_update_jira_and_generate_release_notes">10.2.12. Update JIRA and generate Release notes</h4>
+<h4 id="_update_jira_and_generate_release_notes">10.3.12. Update JIRA and generate Release notes</h4>
<div class="sect4">
<h5 id="_close_all_jira_tickets_for_the_release">Close All JIRA tickets for the release</h5>
<div class="paragraph">
@@ -4238,7 +4375,7 @@ git fetch</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_announce_the_release">10.2.13. Announce the release</h4>
+<h4 id="_announce_the_release">10.3.13. Announce the release</h4>
<div class="paragraph">
<p>Announce the release to <a href="mailto:users@isis.apache.org">users mailing list</a>.</p>
</div>
@@ -4287,7 +4424,7 @@ Enjoy!
</div>
</div>
<div class="sect3">
-<h4 id="_prepare_for_next_iteration">10.2.14. Prepare for next iteration</h4>
+<h4 id="_prepare_for_next_iteration">10.3.14. Prepare for next iteration</h4>
<div class="sect4">
<h5 id="_merge_changes_from_branch_back_into_code_master_code_branch">Merge changes from branch back into <code>master</code> branch</h5>
<div class="paragraph">
@@ -4343,12 +4480,12 @@ git push</code></pre>
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_cutting-a-release-one-pager">10.3. Cutting a release (1 pager)</h3>
+<h3 id="_cg_committers_cutting-a-release-one-pager">10.4. Cutting a release (1 pager)</h3>
<div class="paragraph">
<p>See also the <a href="#_cg_release-process">full release process</a> and the <a href="#_cg_committers_release-checklist">release checklist</a>.</p>
</div>
<div class="sect3">
-<h4 id="_switch_to_correct_directory_parameterize_the_release">10.3.1. Switch to correct directory, parameterize the release</h4>
+<h4 id="_switch_to_correct_directory_parameterize_the_release">10.4.1. Switch to correct directory, parameterize the release</h4>
<div class="admonitionblock warning">
<table>
<tr>
@@ -4385,7 +4522,7 @@ env | grep ISIS | sort</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_get_code">10.3.2. Get code</h4>
+<h4 id="_get_code">10.4.2. Get code</h4>
<div class="paragraph">
<p>Pull down latest, create branch (eg <code>prepare/isis-1.8.0</code>):</p>
</div>
@@ -4398,7 +4535,7 @@ git checkout -b $ISISART-$ISISREL</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_update_parent_pom">10.3.3. Update parent pom</h4>
+<h4 id="_update_parent_pom">10.4.3. Update parent pom</h4>
<div class="paragraph">
<p>Check:</p>
</div>
@@ -4411,7 +4548,7 @@ git checkout -b $ISISART-$ISISREL</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_check_for_snapshot_dependencies">10.3.4. Check for SNAPSHOT dependencies</h4>
+<h4 id="_check_for_snapshot_dependencies">10.4.4. Check for SNAPSHOT dependencies</h4>
<div class="paragraph">
<p>Search for any non-<code>SNAPSHOT</code> usages (including tck project, if any):</p>
</div>
@@ -4430,7 +4567,7 @@ git checkout -b $ISISART-$ISISREL</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_sanity_check_2">10.3.5. Sanity check</h4>
+<h4 id="_sanity_check_2">10.4.5. Sanity check</h4>
<div class="admonitionblock warning">
<table>
<tr>
@@ -4458,7 +4595,7 @@ mvn clean install -o</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_check_versions">10.3.6. Check versions</h4>
+<h4 id="_check_versions">10.4.6. Check versions</h4>
<div class="admonitionblock tip">
<table>
<tr>
@@ -4493,7 +4630,7 @@ grep "\->" /tmp/foo | /bin/sort -u</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_update_license_information">10.3.7. Update license information</h4>
+<h4 id="_update_license_information">10.4.7. Update license information</h4>
<div class="sect4">
<h5 id="_missing_license_headers_in_files">Missing license headers in files:</h5>
<div class="listingblock">
@@ -4518,7 +4655,7 @@ fi</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_commit_changes_2">10.3.8. Commit changes</h4>
+<h4 id="_commit_changes_2">10.4.8. Commit changes</h4>
<div class="paragraph">
<p>Commit any changes from the preceding steps:</p>
</div>
@@ -4529,7 +4666,7 @@ fi</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_release">10.3.9. Release</h4>
+<h4 id="_release">10.4.9. Release</h4>
<div class="admonitionblock warning">
<table>
<tr>
@@ -4622,13 +4759,13 @@ popd</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_nexus_staging">10.3.10. Nexus staging</h4>
+<h4 id="_nexus_staging">10.4.10. Nexus staging</h4>
<div class="paragraph">
<p>Log onto <a href="http://repository.apache.org">repository.apache.org</a> and close the staging repo.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_git_branches_tags">10.3.11. Git branches/tags</h4>
+<h4 id="_git_branches_tags">10.4.11. Git branches/tags</h4>
<div class="paragraph">
<p>Push branch:</p>
</div>
@@ -4649,7 +4786,7 @@ git fetch</code></pre>
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_release-checklist">10.4. Release Checklist</h3>
+<h3 id="_cg_committers_release-checklist">10.5. Release Checklist</h3>
<div class="paragraph">
<p>This page contains a release checklist to support the <a href="#_cg_committers_cutting-a-release">full release process</a> and <a href="#_cg_committers_cutting-a-release-one-pager">one-pager</a>.</p>
</div>
@@ -4753,7 +4890,7 @@ git fetch</code></pre>
</table>
</div>
<div class="sect2">
-<h3 id="_cg_committers_verifying-releases">10.5. Verifying Releases</h3>
+<h3 id="_cg_committers_verifying-releases">10.6. Verifying Releases</h3>
<div class="paragraph">
<p>Whenever a committer announces a vote on a release on the <a href="../support.html">dev mailing list</a>, it is the responsibility of the project’s PMC to cast their vote on the release. Anyone else can also vote, but only members of the Apache Isis PMC’s vote are binding.</p>
</div>
@@ -4780,7 +4917,7 @@ git fetch</code></pre>
<p>Note that the binaries are <em>not</em> an ASF release, they merely exist on the Maven central repo as a convenience. That said, you might also want to verify the release by pulling the binaries from the Maven staging repository. Details of how to do this are also documented below.</p>
</div>
<div class="sect3">
-<h4 id="_prerequisites">10.5.1. Prerequisites</h4>
+<h4 id="_prerequisites_2">10.6.1. Prerequisites</h4>
<div class="paragraph">
<p>To verify the source ZIP files, you will need to have imported the public keys used for signing Apache Isis releases. These can be downloaded from the root of the Apache Isis source tree.</p>
</div>
@@ -4795,7 +4932,7 @@ gpg --import /tmp/KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_verifying_the_source_release_artifacts">10.5.2. Verifying the source release artifacts</h4>
+<h4 id="_verifying_the_source_release_artifacts">10.6.2. Verifying the source release artifacts</h4>
<div class="admonitionblock note">
<table>
<tr>
@@ -4820,7 +4957,7 @@ gpg --import /tmp/KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_building_the_source_release_artifacts">10.5.3. Building the source release artifacts</h4>
+<h4 id="_building_the_source_release_artifacts">10.6.3. Building the source release artifacts</h4>
<div class="paragraph">
<p>Assuming the ZIP file verifies, it should be unpacked, and then the artifact built from source.</p>
</div>
@@ -4856,7 +4993,7 @@ gpg --import /tmp/KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_verifying_the_binary_release_artifacts_using_the_maven_staging_repository">10.5.4. Verifying the binary release artifacts (using the Maven staging repository)</h4>
+<h4 id="_verifying_the_binary_release_artifacts_using_the_maven_staging_repository">10.6.4. Verifying the binary release artifacts (using the Maven staging repository)</h4>
<div class="paragraph">
<p>If you wish, you can verify the binary releases by configuring your local Maven install to point to the Maven Maven staging repository (or repositories) and then using them, eg to run the <a href="../intro/getting-started/simpleapp-archetype.html">simpleapp archetype</a> and running the resultant app.</p>
</div>
@@ -4899,7 +5036,7 @@ gpg --import /tmp/KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_using_the_creadur_tools">10.5.5. Using the Creadur Tools</h4>
+<h4 id="_using_the_creadur_tools">10.6.5. Using the Creadur Tools</h4>
<div class="paragraph">
<p>The <a href="http://creadur.apache.org">Apache Creadur</a> project exists to provide a set of tools to ensure compliance with Apache’s licensing standards. The main release auditing tool, <a href="http://creadur.apache.org/rat">Apache RAT</a>, is used in the preparation of the release (as documented <a href="release-process.html">here</a>). Creadur’s remaining tools are to support the verification process.</p>
</div>
@@ -4908,14 +5045,14 @@ gpg --import /tmp/KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_casting_a_vote">10.5.6. Casting a Vote</h4>
+<h4 id="_casting_a_vote">10.6.6. Casting a Vote</h4>
<div class="paragraph">
<p>When you have made the above checks (and any other checks you think may be relevant), cast your vote by replying to the email thread on the mailing list. If you are casting <code>-1</code>, please provide details of the problem(s) you have found.</p>
</div>
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_verify-releases-using-a-script">10.6. Verify using a script</h3>
+<h3 id="_cg_committers_verify-releases-using-a-script">10.7. Verify using a script</h3>
<div class="paragraph">
<p>To save some time in verifying an Apache Isis release we’ve assembled a script to automate the process. The script is tested on Mac OSX and Linux. Windows users can use Cygwin or <a href="http://msysgit.github.io/">msysgit</a>.</p>
</div>
@@ -4929,7 +5066,7 @@ cd ~/verify-isis-release</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_copy_the_script_to_your_local_machine">10.6.1. Copy the script to your local machine</h4>
+<h4 id="_copy_the_script_to_your_local_machine">10.7.1. Copy the script to your local machine</h4>
<div class="paragraph">
<p>The script could be enhanced in many ways, feel free to do so! Copy (or <a href="resources/release-process/verify-isis-release.sh">download</a>) the <code>verify-isis-release.sh</code> script below:</p>
</div>
@@ -4998,7 +5135,7 @@ _build</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_create_an_input_file">10.6.2. Create an input file</h4>
+<h4 id="_create_an_input_file">10.7.2. Create an input file</h4>
<div class="paragraph">
<p>The input file is a plain <code>.txt</code> file containing all urls to the packages to be verified. Here’s a sample of the release of Apache Isis 1.8.0:</p>
</div>
@@ -5013,7 +5150,7 @@ https://repository.apache.org/content/repositories/orgapacheisis-065/org/apache/
</div>
</div>
<div class="sect3">
-<h4 id="_clean_out_apache_isis_from_your_local_maven_repo">10.6.3. Clean out Apache Isis from your local Maven repo</h4>
+<h4 id="_clean_out_apache_isis_from_your_local_maven_repo">10.7.3. Clean out Apache Isis from your local Maven repo</h4>
<div class="listingblock">
<div class="content">
<pre class="CodeRay highlight"><code data-lang="bash">rm -rf ~/.m2/repository/org/apache/isis</code></pre>
@@ -5021,7 +5158,7 @@ https://repository.apache.org/content/repositories/orgapacheisis-065/org/apache/
</div>
</div>
<div class="sect3">
-<h4 id="_execute_the_script">10.6.4. Execute the script</h4>
+<h4 id="_execute_the_script">10.7.4. Execute the script</h4>
<div class="paragraph">
<p>Execute…​</p>
</div>
@@ -5035,7 +5172,7 @@ https://repository.apache.org/content/repositories/orgapacheisis-065/org/apache/
</div>
</div>
<div class="sect3">
-<h4 id="_test_the_archetype_2">10.6.5. Test the archetype</h4>
+<h4 id="_test_the_archetype_2">10.7.5. Test the archetype</h4>
<div class="paragraph">
<p>Assuming that everything builds ok, then test the archetypes (adjust version as necessary):</p>
</div>
@@ -5062,7 +5199,7 @@ mvn -P self-host antrun:run</code></pre>
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_verifying-releases-using-creadur-tools">10.7. Verifying using Creadur</h3>
+<h3 id="_cg_committers_verifying-releases-using-creadur-tools">10.8. Verifying using Creadur</h3>
<div class="paragraph">
<p>The <a href="http://creadur.apache.org">Apache Creadur</a> project exists to provide a set of tools to ensure compliance with Apache’s licensing standards. The main release auditing tool, <a href="http://creadur.apache.org/rat">Apache RAT</a>, is used in the preparation of the release (as documented <a href="release-process.html">here</a>). Creadur’s remaining tools are to support the verification process.</p>
</div>
@@ -5070,7 +5207,7 @@ mvn -P self-host antrun:run</code></pre>
<p>At the time of writing, these additional tools are quite young and haven’t been formally released; so to use them will take a little bit of work. In the future we expect these tools to mature and ease the effort required to verify releases.</p>
</div>
<div class="sect3">
-<h4 id="_using_the_tentacles_tool">10.7.1. Using the Tentacles tool</h4>
+<h4 id="_using_the_tentacles_tool">10.8.1. Using the Tentacles tool</h4>
<div class="paragraph">
<p>At the time of writing the Tentacles tool hasn’t been released, so you’ll need to build from source:</p>
</div>
@@ -5117,7 +5254,7 @@ java -jar creadur-tentacles/target/apache-tentacles-0.1-SNAPSHOT.jar https://rep
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_release-process-for-snapshots">10.8. Release Process for Snapshots</h3>
+<h3 id="_cg_committers_release-process-for-snapshots">10.9. Release Process for Snapshots</h3>
<div class="paragraph">
<p>Apache Isis consists of a number of separately releasable modules; see the main <a href="release-process.html">release process</a> documentation for full details. All the non-core components depend on the <code>core</code>, and use the <code>core’s parent `pom.xml</code> as their parent pom.</p>
</div>
@@ -5136,7 +5273,7 @@ java -jar creadur-tentacles/target/apache-tentacles-0.1-SNAPSHOT.jar https://rep
</table>
</div>
<div class="sect3">
-<h4 id="_prerequisites_2">10.8.1. Prerequisites</h4>
+<h4 id="_prerequisites_3">10.9.1. Prerequisites</h4>
<div class="paragraph">
<p>Before you start, make sure you’ve defined the snapshots repo in your local <code>~/.m2/settings.xml</code> file:</p>
</div>
@@ -5166,7 +5303,7 @@ It is also possible to configure to use <code>.ssh</code> secure keys, and there
</div>
</div>
<div class="sect3">
-<h4 id="_sanity_check_3">10.8.2. Sanity Check</h4>
+<h4 id="_sanity_check_3">10.9.2. Sanity Check</h4>
<div class="paragraph">
<p>Before deploying the snapshot, perform a quick sanity check.</p>
</div>
@@ -5209,7 +5346,7 @@ It is also possible to configure to use <code>.ssh</code> secure keys, and there
</div>
</div>
<div class="sect3">
-<h4 id="_deploy_all_modules">10.8.3. Deploy All Modules</h4>
+<h4 id="_deploy_all_modules">10.9.3. Deploy All Modules</h4>
<div class="paragraph">
<p>Deploy all modules using:</p>
</div>
@@ -5241,7 +5378,7 @@ It is also possible to configure to use <code>.ssh</code> secure keys, and there
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_key-generation">10.9. Key Generation</h3>
+<h3 id="_cg_committers_key-generation">10.10. Key Generation</h3>
<div class="paragraph">
<p>In order that a contributor can make a release it is necessary for them to have generated a key and had that key recognized by other members of the Apache Software Foundation.</p>
</div>
@@ -5249,7 +5386,7 @@ It is also possible to configure to use <code>.ssh</code> secure keys, and there
<p>For further background information on this topic, see the <a href="http://www.apache.org/dev/release-signing.html">release signing page</a> and the <a href="http://www.apache.org/dev/openpgp.html#generate-key">openpgp page</a> on the Apache wiki.</p>
</div>
<div class="sect3">
-<h4 id="_install_and_configure_gpg">10.9.1. Install and Configure gpg</h4>
+<h4 id="_install_and_configure_gpg">10.10.1. Install and Configure gpg</h4>
<div class="paragraph">
<p>Download and install GnuPG (gpg), version 1.4.10 or higher.</p>
</div>
@@ -5265,7 +5402,7 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB
</div>
</div>
<div class="sect3">
-<h4 id="_key_generation">10.9.2. Key Generation</h4>
+<h4 id="_key_generation">10.10.2. Key Generation</h4>
<div class="paragraph">
<p>The Apache Software Foundation requires that keys are signed with a key (or subkey) based on RSA 4096 bits. To do this:</p>
</div>
@@ -5444,7 +5581,7 @@ gpg></code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_subkey_generation">10.9.3. Subkey Generation</h4>
+<h4 id="_subkey_generation">10.10.3. Subkey Generation</h4>
<div class="paragraph">
<p>It’s recommended to use a subkey with an expiry date to sign releases, rather than your main, non-expiring key. If a subkey is present, then gpg will use it for signing in preference to the main key.</p>
</div>
@@ -5557,7 +5694,7 @@ gpg></code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_generate_a_revocation_certificate">10.9.4. Generate a Revocation Certificate</h4>
+<h4 id="_generate_a_revocation_certificate">10.10.4. Generate a Revocation Certificate</h4>
<div class="paragraph">
<p>It’s good practice to generate a number of revocation certificates so that the key can be revoked if it happens to be compromised. See the <a href="http://www.apache.org/dev/openpgp.html#revocation-certs">gpg page</a> on the Apache wiki for more background on this topic.</p>
</div>
@@ -5660,7 +5797,7 @@ your machine might store the data and make it available to others!</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_publish_key">10.9.5. Publish Key</h4>
+<h4 id="_publish_key">10.10.5. Publish Key</h4>
<div class="paragraph">
<p>It is also necessary to publish your key. There are several places where this should be done. In most cases, you’ll need the "armored" " (ie ASCII) representation of your key. This can be generated using:</p>
</div>
@@ -5878,13 +6015,13 @@ gpg --armor --export nnnnnnnn >>KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_attend_key_signing_party_apache_web_of_trust">10.9.6. Attend Key Signing Party (Apache web of trust)</h4>
+<h4 id="_attend_key_signing_party_apache_web_of_trust">10.10.6. Attend Key Signing Party (Apache web of trust)</h4>
<div class="paragraph">
<p>It is strongly advised that the contributor attend a key signing party at an Apache event, in order that other Apache committers/members can in person verify their identity against the key. The process for this is described <a href="http://www.apache.org/dev/release-signing.html#key-signing-party">here</a> and <a href="http://wiki.apache.org/apachecon/PgpKeySigning">here</a>.</p>
</div>
</div>
<div class="sect3">
-<h4 id="_update_maven_settings_file_code_m2_settings_xml_code">10.9.7. Update Maven Settings file (<code>~/.m2/settings.xml</code>)</h4>
+<h4 id="_update_maven_settings_file_code_m2_settings_xml_code">10.10.7. Update Maven Settings file (<code>~/.m2/settings.xml</code>)</h4>
<div class="paragraph">
<p>The Maven release plugin will automatically sign the release, however it is necessary to update the <code>~/.m2/settings.xml</code> file with your GPG acronym passphrase in order that it can use your secret key. This is defined under a profile so that it is activated only when we perform a release (as defined by <code>[org,apache:apache]</code> parent POM.</p>
</div>
@@ -5927,7 +6064,7 @@ gpg --armor --export nnnnnnnn >>KEYS</code></pre>
</div>
</div>
<div class="sect2">
-<h3 id="_cg_committers_pmc-notes">10.10. Project Management Committee (PMC)</h3>
+<h3 id="_cg_committers_pmc-notes">10.11. Project Management Committee (PMC)</h3>
<div class="paragraph">
<p>Every ASF project has a Project Management Committee, or PMC. This committee is ultimately responsible for the long-term management of the framework. More information about PMCs can be found <a href="http://www.apache.org/dev/pmc.html">here</a></p>
</div>
@@ -5938,7 +6075,7 @@ gpg --armor --export nnnnnnnn >>KEYS</code></pre>
<p>This page contains some general notes on maintenance activities required by PMC members.</p>
</div>
<div class="sect3">
-<h4 id="_accessing_code_people_apache_org_code">10.10.1. Accessing <code>people.apache.org</code></h4>
+<h4 id="_accessing_code_people_apache_org_code">10.11.1. Accessing <code>people.apache.org</code></h4>
<div class="paragraph">
<p>Must be accessed via ssh.</p>
</div>
@@ -5955,7 +6092,7 @@ gpg --armor --export nnnnnnnn >>KEYS</code></pre>
</div>
</div>
<div class="sect3">
-<h4 id="_ldap_access_unix_groups">10.10.2. LDAP Access (UNIX groups)</h4>
+<h4 id="_ldap_access_unix_groups">10.11.2. LDAP Access (UNIX groups)</h4>
<div class="paragraph">
<p>Whenever we get a new committer, the ASF LDAP entries must be maintained to grant access to our repos and various other 'karma'.</p>
</div>
@@ -6448,10 +6585,16 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
</li>
<li><a href="#_cg_committers">10. Committers</a>
<ul class="sectlevel2">
-<li><a href="#_cg_committers_recreating-an-archetype">10.1. Recreating an Archetype</a>
+<li><a href="#_cg_committers_merging-a-pull-request">10.1. Merging a Pull Request</a>
+<ul class="sectlevel3">
+<li><a href="#_prerequisites">10.1.1. Prerequisites</a></li>
+<li><a href="#_example_transcript">10.1.2. Example transcript</a></li>
+</ul>
+</li>
+<li><a href="#_cg_committers_recreating-an-archetype">10.2. Recreating an Archetype</a>
<ul class="sectlevel3">
-<li><a href="#_setup_environment_variables">10.1.1. Setup environment variables</a></li>
-<li><a href="#_check_the_example_app">10.1.2. Check the example app</a>
+<li><a href="#_setup_environment_variables">10.2.1. Setup environment variables</a></li>
+<li><a href="#_check_the_example_app">10.2.2. Check the example app</a>
<ul class="sectlevel4">
<li><a href="#_create_the_archetype_manual">Create the archetype (manual)</a></li>
<li><a href="#_test_the_archetype">Test the archetype</a></li>
@@ -6462,16 +6605,16 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
</li>
</ul>
</li>
-<li><a href="#_cg_committers_cutting-a-release">10.2. Cutting a Release</a>
+<li><a href="#_cg_committers_cutting-a-release">10.3. Cutting a Release</a>
<ul class="sectlevel3">
-<li><a href="#_intro">10.2.1. Intro</a></li>
-<li><a href="#_process_prerequisites">10.2.2. Process Prerequisites</a>
+<li><a href="#_intro">10.3.1. Intro</a></li>
+<li><a href="#_process_prerequisites">10.3.2. Process Prerequisites</a>
<ul class="sectlevel4">
<li><a href="#_set_up_local_environment">Set up local environment</a></li>
</ul>
</li>
-<li><a href="#_set_environment_variables">10.2.3. Set Environment Variables</a></li>
-<li><a href="#_code_prerequisites">10.2.4. Code Prerequisites</a>
+<li><a href="#_set_environment_variables">10.3.3. Set Environment Variables</a></li>
+<li><a href="#_code_prerequisites">10.3.4. Code Prerequisites</a>
<ul class="sectlevel4">
<li><a href="#_update_the_version_number">Update the version number</a></li>
<li><a href="#_update_parent_apache_isis_core">Update parent (Apache Isis Core)</a></li>
@@ -6483,20 +6626,20 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
<li><a href="#_missing_license_check">Missing License Check</a></li>
</ul>
</li>
-<li><a href="#_sanity_check">10.2.5. Sanity check</a>
+<li><a href="#_sanity_check">10.3.5. Sanity check</a>
<ul class="sectlevel4">
<li><a href="#_sanity_check_for_code_core_code">Sanity check for <code>core</code></a></li>
<li><a href="#_sanity_check_for_non_code_core_code_components">Sanity check for non-<code>core</code> components</a></li>
</ul>
</li>
-<li><a href="#_commit_changes">10.2.6. Commit changes</a></li>
-<li><a href="#_preparing_a_release_code_mvn_release_prepare_code">10.2.7. Preparing a Release (<code>mvn release:prepare</code>)</a>
+<li><a href="#_commit_changes">10.3.6. Commit changes</a></li>
+<li><a href="#_preparing_a_release_code_mvn_release_prepare_code">10.3.7. Preparing a Release (<code>mvn release:prepare</code>)</a>
<ul class="sectlevel4">
<li><a href="#_dry_run">Dry-run</a></li>
<li><a href="#_post_prepare_sanity_check">Post-prepare sanity check</a></li>
</ul>
</li>
-<li><a href="#_upload_release_for_voting">10.2.8. Upload Release for Voting</a>
+<li><a href="#_upload_release_for_voting">10.3.8. Upload Release for Voting</a>
<ul class="sectlevel4">
<li><a href="#_perform_the_release">Perform the Release</a></li>
<li><a href="#_check_the_repository">Check the Repository</a></li>
@@ -6504,24 +6647,24 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
<li><a href="#_push_changes">Push changes</a></li>
</ul>
</li>
-<li><a href="#_voting">10.2.9. Voting</a>
+<li><a href="#_voting">10.3.9. Voting</a>
<ul class="sectlevel4">
<li><a href="#_start_voting_thread_on_a_href_mailto_e_p_e_g_e_p_e_g_a">Start voting thread on <a href="mailto:dev@isis.apache.org">dev@isis.apache.org</a></a></li>
</ul>
</li>
-<li><a href="#_after_the_vote">10.2.10. After the vote</a>
+<li><a href="#_after_the_vote">10.3.10. After the vote</a>
<ul class="sectlevel4">
<li><a href="#_for_a_successful_vote">For a successful vote</a></li>
<li><a href="#_for_an_unsuccessful_vote">For an unsuccessful vote</a></li>
</ul>
</li>
-<li><a href="#_promoting_release_to_distribution">10.2.11. Promoting Release to Distribution</a>
+<li><a href="#_promoting_release_to_distribution">10.3.11. Promoting Release to Distribution</a>
<ul class="sectlevel4">
<li><a href="#_release_binaries_to_maven_central_repo">Release Binaries to Maven Central Repo</a></li>
<li><a href="#_release_source_zip">Release Source Zip</a></li>
</ul>
</li>
-<li><a href="#_update_jira_and_generate_release_notes">10.2.12. Update JIRA and generate Release notes</a>
+<li><a href="#_update_jira_and_generate_release_notes">10.3.12. Update JIRA and generate Release notes</a>
<ul class="sectlevel4">
<li><a href="#_close_all_jira_tickets_for_the_release">Close All JIRA tickets for the release</a></li>
<li><a href="#_generate_release_notes_in_jira">Generate Release Notes in JIRA</a></li>
@@ -6529,12 +6672,12 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
<li><a href="#_update_isis_website">Update ISIS website</a></li>
</ul>
</li>
-<li><a href="#_announce_the_release">10.2.13. Announce the release</a>
+<li><a href="#_announce_the_release">10.3.13. Announce the release</a>
<ul class="sectlevel4">
<li><a href="#_blog_post">Blog post</a></li>
</ul>
</li>
-<li><a href="#_prepare_for_next_iteration">10.2.14. Prepare for next iteration</a>
+<li><a href="#_prepare_for_next_iteration">10.3.14. Prepare for next iteration</a>
<ul class="sectlevel4">
<li><a href="#_merge_changes_from_branch_back_into_code_master_code_branch">Merge changes from branch back into <code>master</code> branch</a></li>
<li><a href="#_update_code_status_code_file">Update <code>STATUS</code> file</a></li>
@@ -6543,76 +6686,76 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
</li>
</ul>
</li>
-<li><a href="#_cg_committers_cutting-a-release-one-pager">10.3. Cutting a release (1 pager)</a>
+<li><a href="#_cg_committers_cutting-a-release-one-pager">10.4. Cutting a release (1 pager)</a>
<ul class="sectlevel3">
-<li><a href="#_switch_to_correct_directory_parameterize_the_release">10.3.1. Switch to correct directory, parameterize the release</a></li>
-<li><a href="#_get_code">10.3.2. Get code</a></li>
-<li><a href="#_update_parent_pom">10.3.3. Update parent pom</a></li>
-<li><a href="#_check_for_snapshot_dependencies">10.3.4. Check for SNAPSHOT dependencies</a></li>
-<li><a href="#_sanity_check_2">10.3.5. Sanity check</a></li>
-<li><a href="#_check_versions">10.3.6. Check versions</a>
+<li><a href="#_switch_to_correct_directory_parameterize_the_release">10.4.1. Switch to correct directory, parameterize the release</a></li>
+<li><a href="#_get_code">10.4.2. Get code</a></li>
+<li><a href="#_update_parent_pom">10.4.3. Update parent pom</a></li>
+<li><a href="#_check_for_snapshot_dependencies">10.4.4. Check for SNAPSHOT dependencies</a></li>
+<li><a href="#_sanity_check_2">10.4.5. Sanity check</a></li>
+<li><a href="#_check_versions">10.4.6. Check versions</a>
<ul class="sectlevel4">
<li><a href="#_update_plugin_versions_2">Update plugin versions</a></li>
<li><a href="#_newer_dependencies">Newer dependencies:</a></li>
</ul>
</li>
-<li><a href="#_update_license_information">10.3.7. Update license information</a>
+<li><a href="#_update_license_information">10.4.7. Update license information</a>
<ul class="sectlevel4">
<li><a href="#_missing_license_headers_in_files">Missing license headers in files:</a></li>
<li><a href="#_missing_spurious_code_supplemental_models_xml_code">Missing/spurious <code>supplemental-models.xml</code></a></li>
</ul>
</li>
-<li><a href="#_commit_changes_2">10.3.8. Commit changes</a></li>
-<li><a href="#_release">10.3.9. Release</a>
+<li><a href="#_commit_changes_2">10.4.8. Commit changes</a></li>
+<li><a href="#_release">10.4.9. Release</a>
<ul class="sectlevel4">
<li><a href="#_prepare">Prepare:</a></li>
<li><a href="#_confirm">Confirm:</a></li>
<li><a href="#_perform">Perform:</a></li>
</ul>
</li>
-<li><a href="#_nexus_staging">10.3.10. Nexus staging</a></li>
-<li><a href="#_git_branches_tags">10.3.11. Git branches/tags</a></li>
+<li><a href="#_nexus_staging">10.4.10. Nexus staging</a></li>
+<li><a href="#_git_branches_tags">10.4.11. Git branches/tags</a></li>
</ul>
</li>
-<li><a href="#_cg_committers_release-checklist">10.4. Release Checklist</a></li>
-<li><a href="#_cg_committers_verifying-releases">10.5. Verifying Releases</a>
+<li><a href="#_cg_committers_release-checklist">10.5. Release Checklist</a></li>
+<li><a href="#_cg_committers_verifying-releases">10.6. Verifying Releases</a>
<ul class="sectlevel3">
-<li><a href="#_prerequisites">10.5.1. Prerequisites</a></li>
-<li><a href="#_verifying_the_source_release_artifacts">10.5.2. Verifying the source release artifacts</a></li>
-<li><a href="#_building_the_source_release_artifacts">10.5.3. Building the source release artifacts</a></li>
-<li><a href="#_verifying_the_binary_release_artifacts_using_the_maven_staging_repository">10.5.4. Verifying the binary release artifacts (using the Maven staging repository)</a></li>
-<li><a href="#_using_the_creadur_tools">10.5.5. Using the Creadur Tools</a></li>
-<li><a href="#_casting_a_vote">10.5.6. Casting a Vote</a></li>
+<li><a href="#_prerequisites_2">10.6.1. Prerequisites</a></li>
+<li><a href="#_verifying_the_source_release_artifacts">10.6.2. Verifying the source release artifacts</a></li>
+<li><a href="#_building_the_source_release_artifacts">10.6.3. Building the source release artifacts</a></li>
+<li><a href="#_verifying_the_binary_release_artifacts_using_the_maven_staging_repository">10.6.4. Verifying the binary release artifacts (using the Maven staging repository)</a></li>
+<li><a href="#_using_the_creadur_tools">10.6.5. Using the Creadur Tools</a></li>
+<li><a href="#_casting_a_vote">10.6.6. Casting a Vote</a></li>
</ul>
</li>
-<li><a href="#_cg_committers_verify-releases-using-a-script">10.6. Verify using a script</a>
+<li><a href="#_cg_committers_verify-releases-using-a-script">10.7. Verify using a script</a>
<ul class="sectlevel3">
-<li><a href="#_copy_the_script_to_your_local_machine">10.6.1. Copy the script to your local machine</a></li>
-<li><a href="#_create_an_input_file">10.6.2. Create an input file</a></li>
-<li><a href="#_clean_out_apache_isis_from_your_local_maven_repo">10.6.3. Clean out Apache Isis from your local Maven repo</a></li>
-<li><a href="#_execute_the_script">10.6.4. Execute the script</a></li>
-<li><a href="#_test_the_archetype_2">10.6.5. Test the archetype</a></li>
+<li><a href="#_copy_the_script_to_your_local_machine">10.7.1. Copy the script to your local machine</a></li>
+<li><a href="#_create_an_input_file">10.7.2. Create an input file</a></li>
+<li><a href="#_clean_out_apache_isis_from_your_local_maven_repo">10.7.3. Clean out Apache Isis from your local Maven repo</a></li>
+<li><a href="#_execute_the_script">10.7.4. Execute the script</a></li>
+<li><a href="#_test_the_archetype_2">10.7.5. Test the archetype</a></li>
</ul>
</li>
-<li><a href="#_cg_committers_verifying-releases-using-creadur-tools">10.7. Verifying using Creadur</a>
+<li><a href="#_cg_committers_verifying-releases-using-creadur-tools">10.8. Verifying using Creadur</a>
<ul class="sectlevel3">
-<li><a href="#_using_the_tentacles_tool">10.7.1. Using the Tentacles tool</a></li>
+<li><a href="#_using_the_tentacles_tool">10.8.1. Using the Tentacles tool</a></li>
</ul>
</li>
-<li><a href="#_cg_committers_release-process-for-snapshots">10.8. Release Process for Snapshots</a>
+<li><a href="#_cg_committers_release-process-for-snapshots">10.9. Release Process for Snapshots</a>
<ul class="sectlevel3">
-<li><a href="#_prerequisites_2">10.8.1. Prerequisites</a></li>
-<li><a href="#_sanity_check_3">10.8.2. Sanity Check</a></li>
-<li><a href="#_deploy_all_modules">10.8.3. Deploy All Modules</a></li>
+<li><a href="#_prerequisites_3">10.9.1. Prerequisites</a></li>
+<li><a href="#_sanity_check_3">10.9.2. Sanity Check</a></li>
+<li><a href="#_deploy_all_modules">10.9.3. Deploy All Modules</a></li>
</ul>
</li>
-<li><a href="#_cg_committers_key-generation">10.9. Key Generation</a>
+<li><a href="#_cg_committers_key-generation">10.10. Key Generation</a>
<ul class="sectlevel3">
-<li><a href="#_install_and_configure_gpg">10.9.1. Install and Configure gpg</a></li>
-<li><a href="#_key_generation">10.9.2. Key Generation</a></li>
-<li><a href="#_subkey_generation">10.9.3. Subkey Generation</a></li>
-<li><a href="#_generate_a_revocation_certificate">10.9.4. Generate a Revocation Certificate</a></li>
-<li><a href="#_publish_key">10.9.5. Publish Key</a>
+<li><a href="#_install_and_configure_gpg">10.10.1. Install and Configure gpg</a></li>
+<li><a href="#_key_generation">10.10.2. Key Generation</a></li>
+<li><a href="#_subkey_generation">10.10.3. Subkey Generation</a></li>
+<li><a href="#_generate_a_revocation_certificate">10.10.4. Generate a Revocation Certificate</a></li>
+<li><a href="#_publish_key">10.10.5. Publish Key</a>
<ul class="sectlevel4">
<li><a href="#_publish_to_a_public_key_server">Publish to a public key server</a></li>
<li><a href="#_publish_to_your_apache_home_directory">Publish to your Apache home directory</a></li>
@@ -6622,14 +6765,14 @@ git reset --hard <i>shaId</i> # move master branch shaId of com
<li><a href="#_id_apache_org">id.apache.org</a></li>
</ul>
</li>
-<li><a href="#_attend_key_signing_party_apache_web_of_trust">10.9.6. Attend Key Signing Party (Apache web of trust)</a></li>
-<li><a href="#_update_maven_settings_file_code_m2_settings_xml_code">10.9.7. Update Maven Settings file (<code>~/.m2/settings.xml</code>)</a></li>
+<li><a href="#_attend_key_signing_party_apache_web_of_trust">10.10.6. Attend Key Signing Party (Apache web of trust)</a></li>
+<li><a href="#_update_maven_settings_file_code_m2_settings_xml_code">10.10.7. Update Maven Settings file (<code>~/.m2/settings.xml</code>)</a></li>
</ul>
</li>
-<li><a href="#_cg_committers_pmc-notes">10.10. Project Management Committee (PMC)</a>
+<li><a href="#_cg_committers_pmc-notes">10.11. Project Management Committee (PMC)</a>
<ul class="sectlevel3">
-<li><a href="#_accessing_code_people_apache_org_code">10.10.1. Accessing <code>people.apache.org</code></a></li>
-<li><a href="#_ldap_access_unix_groups">10.10.2. LDAP Access (UNIX groups)</a></li>
+<li><a href="#_accessing_code_people_apache_org_code">10.11.1. Accessing <code>people.apache.org</code></a></li>
+<li><a href="#_ldap_access_unix_groups">10.11.2. LDAP Access (UNIX groups)</a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/isis-site/blob/e426c85c/content/guides/images/committers/github-pr-history.png
----------------------------------------------------------------------
diff --git a/content/guides/images/committers/github-pr-history.png b/content/guides/images/committers/github-pr-history.png
new file mode 100644
index 0000000..00e1f08
Binary files /dev/null and b/content/guides/images/committers/github-pr-history.png differ