You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by bu...@apache.org on 2014/11/14 20:37:57 UTC
svn commit: r929245 - in /websites/staging/slider/trunk/content: ./
developing/releasing.html developing/windows.html
Author: buildbot
Date: Fri Nov 14 19:37:57 2014
New Revision: 929245
Log:
Staging update by buildbot for slider
Modified:
websites/staging/slider/trunk/content/ (props changed)
websites/staging/slider/trunk/content/developing/releasing.html
websites/staging/slider/trunk/content/developing/windows.html
Propchange: websites/staging/slider/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Nov 14 19:37:57 2014
@@ -1 +1 @@
-1638906
+1639762
Modified: websites/staging/slider/trunk/content/developing/releasing.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/releasing.html (original)
+++ websites/staging/slider/trunk/content/developing/releasing.html Fri Nov 14 19:37:57 2014
@@ -204,25 +204,32 @@ according to the instructions in <a href
create HBase and Accumulo clusters in the YARN cluster.</p>
<p><em>Make sure that the integration tests are passing (and not being skipped) before
starting to make a release</em></p>
-<p><em>2.</em> Check out the latest version of <code>origin/master</code>.</p>
-<h2 id="wzxhzdk36wzxhzdk37phase-i"><a name="phase1"></a>Phase - I</h2>
+<p><em>2.</em> Check out the latest version of <code>origin/master</code>.</p>
+<p><em>3.</em> If you are not building against a stable Hadoop release</p>
+<ol>
+<li>Check out the hadoop branch you intend to build and test against âand include in
+ the redistributable artifacts.</li>
+<li>Build it via <code>mvn clean install -DskipTests</code></li>
+<li>Note the git revision number of this build -for documentation.</li>
+<li>Maybe: tag that revision so you can easily revert to it</li>
+</ol>
+<h5 id="profiles">Profiles</h5>
+<p>The slider POMs offer different profiles of hadoop versions to build against. The instructions
+below do not choose one. If a profile is needed, append it to all the maven commands.</p>
+<p>e.g. {{mvn clean install -DskipTests -Prelease-2.6}}</p>
+<h2 id="wzxhzdk38wzxhzdk39phase-i"><a name="phase1"></a>Phase - I</h2>
<p><strong>Step #1:</strong> Create a JIRA for the release, estimate 3h
(so you don't try to skip the tests)</p>
-<div class="codehilite"><pre><span class="n">export</span> <span class="n">SLIDER_RELEASE_JIRA</span><span class="p">=</span><span class="n">SLIDER</span><span class="o">-</span>13927
+<div class="codehilite"><pre><span class="n">export</span> <span class="n">SLIDER_RELEASE_JIRA</span><span class="p">=</span><span class="n">SLIDER</span><span class="o">-</span>544
</pre></div>
<p><strong>Step #2:</strong> Check everything in. Git flow won't let you progress without this.</p>
-<p><strong>Step #3:</strong> Git flow: create a release branch</p>
-<div class="codehilite"><pre><span class="n">export</span> <span class="n">SLIDER_RELEASE</span><span class="p">=</span>0<span class="p">.</span>50<span class="p">.</span>1<span class="o">-</span><span class="n">incubating</span>
-
-<span class="n">git</span> <span class="n">flow</span> <span class="n">release</span> <span class="n">start</span> <span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span>
-</pre></div>
-
-
-<p><strong>Step #4:</strong> In the new branch, increment those version numbers using <a href="http://mojo.codehaus.org/versions-maven-plugin/">the maven
+<p><strong>Step #4:</strong> Increment those version numbers using <a href="http://mojo.codehaus.org/versions-maven-plugin/">the maven
versions plugin</a></p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">versions</span><span class="p">:</span><span class="n">set</span> <span class="o">-</span><span class="n">DnewVersion</span><span class="p">=</span>$<span class="n">SLIDER_RELEASE</span>
+<div class="codehilite"><pre><span class="n">export</span> <span class="n">SLIDER_RELEASE</span><span class="p">=</span>0<span class="p">.</span>60<span class="p">.</span>0<span class="o">-</span><span class="n">incubating</span>
+
+<span class="n">mvn</span> <span class="n">versions</span><span class="p">:</span><span class="n">set</span> <span class="o">-</span><span class="n">DnewVersion</span><span class="p">=</span>$<span class="n">SLIDER_RELEASE</span>
</pre></div>
@@ -233,6 +240,11 @@ versions plugin</a></p>
</pre></div>
+<p><strong>Step #3:</strong> Create and check out a release branch</p>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="o">-</span><span class="n">b</span> <span class="n">releases</span><span class="o">/</span><span class="n">slider</span><span class="o">-</span>0<span class="p">.</span>60
+</pre></div>
+
+
<p><strong>Step #6:</strong> Do a final test run to make sure nothing is broken</p>
<p>In the <code>slider</code> directory, run:</p>
<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">DskipTests</span>
@@ -258,7 +270,7 @@ the tests time out.</p>
<p>As the test run takes 30-60+ minutes, now is a good time to consider
finalizing the release notes.</p>
<p><strong>Step #7:</strong> Build the release package</p>
-<p>Run</p>
+<p>Run the <code>package</code> goal:</p>
<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">site</span><span class="p">:</span><span class="n">site</span> <span class="n">site</span><span class="p">:</span><span class="n">stage</span> <span class="n">package</span> <span class="o">-</span><span class="n">DskipTests</span>
</pre></div>
@@ -267,7 +279,10 @@ finalizing the release notes.</p>
<p>Look in <code>slider-assembly/target</code> to find the <code>.tar.gz</code> file, and the
expanded version of it. Inspect that expanded version to make sure that
everything looks good -and that the versions of all the dependent artifacts
-look good too: there must be no <code>-SNAPSHOT</code> dependencies.</p>
+look good too: there must be no <code>-SNAPSHOT</code> dependencies. [Exception, when the release
+is deliberately made against an unreleased version of Hadoop or other dependencies.
+in that situation the unreleased dependency is expected to consist of <code>-SNAPSHORT</code>
+artifacts]</p>
<p>tip: the lib dir can be viewed with</p>
<div class="codehilite"><pre><span class="n">ls</span> <span class="o">-</span><span class="n">l</span> <span class="n">slider</span><span class="o">-</span><span class="n">assembly</span><span class="o">/</span><span class="n">target</span><span class="o">/</span><span class="n">lib</span>
</pre></div>
@@ -277,7 +292,7 @@ look good too: there must be no <code>-S
<p><strong>Step #9:</strong> Build the release notes</p>
<p>Create a a one-line plain text release note for commits and tags
and a multi-line markdown release note which will be used for artifacts.</p>
-<div class="codehilite"><pre><span class="n">Release</span> <span class="n">against</span> <span class="n">hadoop</span> 2<span class="p">.</span>4<span class="p">.</span>1<span class="p">,</span> <span class="n">HBase</span><span class="o">-</span>0<span class="p">.</span>98<span class="p">.</span>5 <span class="n">and</span> <span class="n">Accumulo</span> 1<span class="p">.</span>6<span class="p">.</span>0 <span class="n">artifacts</span><span class="p">.</span>
+<div class="codehilite"><pre><span class="n">Release</span> <span class="n">against</span> <span class="n">hadoop</span> 2<span class="p">.</span>6<span class="p">.</span>0
</pre></div>
@@ -288,36 +303,28 @@ and a multi-line markdown release note w
</pre></div>
-<p><strong>Step #10:</strong> End the git flow</p>
-<p>Finish the git flow release, either in a tool such as SourceTree GUI or
-the command line:</p>
-<div class="codehilite"><pre><span class="n">git</span> <span class="n">flow</span> <span class="n">release</span> <span class="n">finish</span> <span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span>
+<p><strong>Step #10:</strong> Get back to the develop branch</p>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="n">develop</span>
</pre></div>
-<p><em>tip</em> in the CLI this asks for the message 3x times; copy the release text to
-paste in.</p>
<p>You will now be back on the <code>develop</code> branch.</p>
-<p><strong>Step #11:</strong> update mvn versions</p>
+<p><strong>Step #11:</strong> update maven versions</p>
<p>Switch back to <code>develop</code> and update its version number past
the release number</p>
-<div class="codehilite"><pre><span class="n">export</span> <span class="n">SLIDER_DEV</span><span class="p">=</span>0<span class="p">.</span>51<span class="p">.</span>0<span class="o">-</span><span class="n">incubating</span><span class="o">-</span><span class="n">SNAPSHOT</span>
+<div class="codehilite"><pre><span class="n">export</span> <span class="n">SLIDER_DEV</span><span class="p">=</span>0<span class="p">.</span>61<span class="p">.</span>0<span class="o">-</span><span class="n">incubating</span><span class="o">-</span><span class="n">SNAPSHOT</span>
<span class="n">mvn</span> <span class="n">versions</span><span class="p">:</span><span class="n">set</span> <span class="o">-</span><span class="n">DnewVersion</span><span class="p">=</span>$<span class="n">SLIDER_DEV</span>
<span class="n">git</span> <span class="n">commit</span> <span class="o">-</span><span class="n">a</span> <span class="o">-</span><span class="n">m</span> "$<span class="n">SLIDER_RELEASE_JIRA</span> <span class="n">updating</span> <span class="n">development</span> <span class="n">POMs</span> <span class="n">to</span> $<span class="n">SLIDER_DEV</span>"
</pre></div>
<p><strong>Step #12:</strong> Push the release and develop branches to github </p>
-<div class="codehilite"><pre><span class="n">git</span> <span class="n">push</span> <span class="n">origin</span> <span class="n">master</span> <span class="n">develop</span>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">push</span> <span class="n">origin</span> <span class="n">develop</span> <span class="n">releases</span><span class="o">/</span><span class="n">slider</span><span class="o">-</span>0<span class="p">.</span>60
</pre></div>
<p>(assuming that <code>origin</code> maps to <code>https://git-wip-us.apache.org/repos/asf/incubator-slider.git</code>;
you can check this with <code>git remote -v</code></p>
-<p>The <code>git-flow</code> program automatically pushes up the <code>release/slider-$SLIDER_RELEASE</code> branch,
-before deleting it locally.</p>
-<p>If you are planning on any release work of more than a single test run,
-consider having your local release branch track the master.</p>
<p><strong>Step #13:</strong> Finish the JIRA</p>
<p>Log the time, close the issue. This should normally be the end of a
sprint -so wrap that up too.</p>
@@ -330,7 +337,7 @@ sprint -so wrap that up too.</p>
<p><em>At this point you are ready for Apache release from master.</em></p>
-<h2 id="wzxhzdk38wzxhzdk39phase-ii"><a name="phase2"></a>Phase - II</h2>
+<h2 id="wzxhzdk40wzxhzdk41phase-ii"><a name="phase2"></a>Phase - II</h2>
<p><strong>Step 1</strong></p>
<p>Get a clean enlistment.</p>
<div class="codehilite"><pre><span class="n">mkdir</span> <span class="n">release</span>
@@ -342,37 +349,36 @@ sprint -so wrap that up too.</p>
<p><strong>Step 2</strong></p>
<p>Ensure you are in the <em>master</em> branch and it's clean. Beware that the git clean command will remove any unknown files to Git in your current repository.</p>
-<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="n">master</span>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="n">releases</span><span class="o">/</span><span class="n">slider</span><span class="o">-</span>0<span class="p">.</span>60
+<span class="n">git</span> <span class="n">pull</span> <span class="n">origin</span>
<span class="n">git</span> <span class="n">clean</span> <span class="o">-</span><span class="n">fxd</span>
</pre></div>
<p><strong>Step 3</strong></p>
<p>Ensure the rat check is clean.</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">apache</span><span class="o">-</span><span class="nb">rat</span><span class="p">:</span><span class="n">check</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">apache</span><span class="o">-</span><span class="nb">rat</span><span class="p">:</span><span class="n">check</span> <span class="o">-</span><span class="n">Prat</span>
</pre></div>
<p><strong>Step 4</strong></p>
<p>Tag for the release. Start with RC0 and move to RC1, RC2 if you need to restart the release process for this version.</p>
-<div class="codehilite"><pre><span class="n">git</span> <span class="n">tag</span> <span class="o">-</span><span class="n">a</span> <span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc0</span> <span class="o">-</span><span class="n">m</span> <span class="s">'Slider $SLIDER_RELEASE-RC0'</span>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">tag</span> <span class="o">-</span><span class="n">a</span> <span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc1</span> <span class="o">-</span><span class="n">m</span> <span class="s">'Slider $SLIDER_RELEASE-RC1'</span>
<span class="n">git</span> <span class="n">push</span> <span class="o">--</span><span class="n">tags</span> <span class="n">origin</span>
</pre></div>
<p><strong>Step 5</strong></p>
<p>Create the release source tarball.</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">DskipTests</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">-</span><span class="n">DskipTests</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="o">-</span><span class="n">Prat</span>
</pre></div>
-<p>You should find a <em>.tar.gz at target folder (e.g. ./target/apache-slider-$SLIDER_RELEASE-source-release.tar.gz and .zip)
-Rename it with </em>incubator* in the name.</p>
+<p>You should find a <code>*.tar.gz</code> at target folder (e.g. <code>./target/apache-slider-$SLIDER_RELEASE-source-release.tar.gz</code> and <code>.zip</code>)
+Rename it with <em>incubator</em> in the name.</p>
<div class="codehilite"><pre><span class="n">cd</span> <span class="n">target</span>
<span class="n">rm</span> <span class="nb">rat</span><span class="p">.</span><span class="n">txt</span>
<span class="n">rm</span> <span class="o">-</span><span class="n">rf</span> <span class="n">archive</span><span class="o">-</span><span class="n">tmp</span>
-
-# <span class="n">mv</span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span>
</pre></div>
@@ -386,7 +392,7 @@ Rename it with </em>incubator* in the na
<p><strong>Step 7</strong></p>
-<p>Generate MD5 checksums. <em>md5sum</em> and <em>sha1sum</em> or <em>gpg</em> are also both capable of creating checksum files.</p>
+<p>Generate MD5 checksums. <em>md5sum</em> and <em>sha1sum</em> or <em>gpg</em> are all capable of creating checksum files.</p>
<div class="codehilite"><pre><span class="n">openssl</span> <span class="n">md5</span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span> <span class="o">></span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">md5</span>
<span class="n">openssl</span> <span class="n">sha1</span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span> <span class="o">></span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">sha</span>
<span class="n">openssl</span> <span class="n">md5</span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">zip</span> <span class="o">></span> <span class="n">apache</span><span class="o">-</span><span class="n">slider</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">source</span><span class="o">-</span><span class="n">release</span><span class="p">.</span><span class="n">zip</span><span class="p">.</span><span class="n">md5</span>
@@ -406,9 +412,15 @@ Rename it with </em>incubator* in the na
<p>Upload the artifacts to your apache home:</p>
<p>The artifacts then need to be copied over to ~/public_html/slider-release-$SLIDER_RELEASE-rc0</p>
<div class="codehilite"><pre><span class="n">cd</span> <span class="p">..</span>
-<span class="n">mv</span> <span class="n">target</span> <span class="n">slider</span><span class="o">-</span><span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc0</span>
+<span class="n">mv</span> <span class="n">target</span> <span class="n">slider</span><span class="o">-</span><span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc1</span>
+
+<span class="n">scp</span> <span class="o">-</span><span class="n">r</span> <span class="n">slider</span><span class="o">-</span><span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc1</span> $<span class="n">ASF_USER</span><span class="p">@</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span><span class="n">public_html</span><span class="o">/</span><span class="n">slider</span><span class="o">/</span>
+</pre></div>
-<span class="n">scp</span> <span class="o">-</span><span class="n">r</span> <span class="n">slider</span><span class="o">-</span><span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc0</span> <span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span><span class="n">public_html</span>
+
+<p>(if you don't get the authentication for the copy, go to https://id.apache.org/ and add your ssh keys to your profile)</p>
+<p>The entire directory should now be uploaded, check it:</p>
+<div class="codehilite"><pre><span class="n">echo</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/~</span>$<span class="n">ASF_USER</span><span class="o">/</span><span class="n">slider</span>
</pre></div>
@@ -421,11 +433,13 @@ yet.</p>
<p><strong>Step 10</strong></p>
<p>Call for a release VOTE to the dev mailing list (dev@slider.incubator.apache.org).</p>
<p>To build the URLs, echo them then verify in your browser that they are present</p>
-<div class="codehilite"><pre><span class="n">echo</span> "<span class="n">artifacts</span> <span class="n">at</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/~</span>$<span class="n">ASF_USER</span><span class="o">/</span><span class="n">slider</span><span class="o">-</span><span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc0</span>"
+<div class="codehilite"><pre><span class="n">echo</span> "<span class="n">artifacts</span> <span class="n">at</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/~</span>$<span class="n">ASF_USER</span><span class="o">/</span><span class="n">slider</span><span class="o">/</span><span class="n">slider</span><span class="o">-</span><span class="n">release</span><span class="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc1</span>"
<span class="n">echo</span> "<span class="n">source</span> <span class="n">at</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">git</span><span class="o">-</span><span class="n">wip</span><span class="o">-</span><span class="n">us</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span>?<span class="n">p</span><span class="p">=</span><span class="n">incubator</span><span class="o">-</span><span class="n">slider</span><span class="p">.</span><span class="n">git</span><span class="p">;</span><span class="n">a</span><span class="p">=</span><span class="n">shortlog</span><span class="p">;</span><span class="n">h</span><span class="p">=</span><span class="n">refs</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span><span class="n">release</span><span cla
ss="o">-</span>$<span class="n">SLIDER_RELEASE</span><span class="o">-</span><span class="n">rc0</span>"
<span class="n">echo</span> "<span class="n">PGP</span> <span class="n">keys</span> <span class="n">at</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">pgp</span><span class="p">.</span><span class="n">mit</span><span class="p">.</span><span class="n">edu</span><span class="p">:</span>11371<span class="o">/</span><span class="n">pks</span><span class="o">/</span><span class="n">lookup</span>?<span class="n">op</span><span class="p">=</span><span class="n">vindex</span><span class="o">&</span><span class="n">search</span><span class="p">=</span>$<span class="n">ASF_USER</span><span class="p">@</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span>"
+
+<span class="n">echo</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Apache</span> <span class="n">Slider</span> <span class="n">Incubating</span> <span class="n">Release</span> $<span class="n">SLIDER_RELEASE</span> <span class="n">RC0</span>
</pre></div>
@@ -484,8 +498,8 @@ If that VOTE passes with the IPMC send a
<p><strong>Step 12</strong></p>
<p>Verify your PGP key is provided to Apache. </p>
<p>Apache verifies that distributions are correctly signed.
-Login to https://id.apache.org and verify the fingerprint of PGP key used to sign above is provided. (gpg --fingerprint)
-Upload your PGP public key only to /home/$ASF_USER/.pgpkey</p>
+Login to <a href="https://id.apache.org">https://id.apache.org</a> and verify the fingerprint of PGP key used to sign above is provided. (<code>gpg --fingerprint</code>)
+Upload your PGP public key only to <code>/home/$ASF_USER/.pgpkey</code></p>
<div class="codehilite"><pre><span class="n">scp</span> <span class="n">public</span><span class="o">-</span><span class="n">key</span><span class="p">.</span><span class="n">asc</span> <span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:.</span><span class="n">pgpkey</span>
</pre></div>
@@ -518,9 +532,9 @@ Upload your PGP public key only to /home
<p>The download details for the latest release needs to be updated after mirrors are updated in <strong>Step 12</strong>. </p>
<p>Verify the download links at <a href="http://slider.incubator.apache.org">Slider Page</a>.</p>
<p><strong>Step 16</strong></p>
-<p>Send an anouncement:</p>
+<p>Send an announcement:</p>
<p>The bits published in <strong>Step 13</strong> may take up to 24 hours to replicate to the mirrors.</p>
-<p>Send an anouncement@apache.org to the dev and user aliases after the bits have replicated.</p>
+<p>Send an announcement to the dev and user aliases after the bits have replicated.</p>
<p>Sample:</p>
<div class="codehilite"><pre><span class="n">Title</span><span class="p">:</span> <span class="p">[</span><span class="n">ANNOUNCE</span><span class="p">]</span> <span class="n">Apache</span> <span class="n">Slider</span> <span class="n">x</span><span class="p">.</span><span class="n">y</span><span class="p">.</span><span class="n">z</span><span class="o">-</span><span class="n">incubating</span><span class="p">.</span>
@@ -596,8 +610,11 @@ the actual development version.</p>
</li>
<li>
<p>reset the versions</p>
-<p>mvn versions:set -DnewVersion=$SLIDER_DEV
-git commit -a -m "$SLIDER_RELEASE_JIRA reverting development POMs to $SLIDER_DEV"</p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">versions</span><span class="p">:</span><span class="n">set</span> <span class="o">-</span><span class="n">DnewVersion</span><span class="p">=</span>$<span class="n">SLIDER_DEV</span>
+<span class="n">git</span> <span class="n">commit</span> <span class="o">-</span><span class="n">a</span> <span class="o">-</span><span class="n">m</span> "$<span class="n">SLIDER_RELEASE_JIRA</span> <span class="n">reverting</span> <span class="n">development</span> <span class="n">POMs</span> <span class="n">to</span> $<span class="n">SLIDER_DEV</span>"
+</pre></div>
+
+
</li>
<li>
<p>Continue the release process from step 12.</p>
Modified: websites/staging/slider/trunk/content/developing/windows.html
==============================================================================
--- websites/staging/slider/trunk/content/developing/windows.html (original)
+++ websites/staging/slider/trunk/content/developing/windows.html Fri Nov 14 19:37:57 2014
@@ -207,8 +207,8 @@ is "private", then edit the firewall to
(even with this installed, you will still be mostly working from the windows
command prompt on the machine, as it has the env variables set up)</li>
<li>Git</li>
-<li>Java 7</li>
-<li>Python 2,7</li>
+<li>Java 7+</li>
+<li>Python 2.7</li>
<li>OpenSSL</li>
<li>Everything Hadoop's <code>BUILDING.TXT</code> needs. This includes the cygwin tools, protoc,
python and more. If you cannot build Hadoop from the <code>Windows SDK Command Prompt</code>
@@ -242,7 +242,7 @@ Their <code>tcpview</code> tool is ideal
<li>Get the cygwin64 bin dir on the PATH (remember, ";" as separators)</li>
<li>find where the <code>CL</code> C/C++ compiler is and make sure it is on the PATH</li>
<li>get the (native) <a href="http://www.cmake.org/">CMake 2.8+</a> command on the path,
-not the cygwin one.</li>
+not any cygwin one.</li>
</ol>
<p>Things to install in cygwin
<em> sh
@@ -315,7 +315,9 @@ dialog.</li>
<li>close the window and re-open it to get the new settings</li>
</ol>
<p>From a Windows SDK command prompt:</p>
-<div class="codehilite"><pre><span class="n">set</span> <span class="n">HADOOP_VERSION</span><span class="p">=</span>2<span class="p">.</span>6<span class="p">.</span>0<span class="o">-</span><span class="n">SNAPSHOT</span>
+<div class="codehilite"><pre><span class="n">set</span> <span class="n">HADOOP_VERSION</span><span class="p">=</span>2<span class="p">.</span>6<span class="p">.</span>0
+
+<span class="n">set</span> <span class="n">HADOOP_VERSION</span><span class="p">=</span>2<span class="p">.</span>7<span class="p">.</span>0<span class="o">-</span><span class="n">SNPSHOT</span>
</pre></div>
@@ -358,7 +360,7 @@ exception)</p>
<p>This should report the hadoop binaries, even if it warns about missing
- compression libraries</p>
+compression libraries</p>
</div>
<div id="footer">