svn commit: r900229 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/contributors/release-process.html

[bu...@apache.org]

Author: buildbot
Date: Thu Mar  6 10:13:16 2014
New Revision: 900229

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/contributors/release-process.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar  6 10:13:16 2014
@@ -1 +1 @@
-1574812
+1574831

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar  6 10:13:16 2014
@@ -1 +1 @@
-1574812
+1574831

Modified: websites/staging/isis/trunk/content/contributors/release-process.html
==============================================================================
--- websites/staging/isis/trunk/content/contributors/release-process.html (original)
+++ websites/staging/isis/trunk/content/contributors/release-process.html Thu Mar  6 10:13:16 2014
@@ -685,16 +685,24 @@ mvn clean install -o
 <p>Run the dry-run as follows:</p>
 
 <pre><code>mvn release:prepare -P apache-release -D dryRun=true \
-    -Dtag=my-proj-1.2.3 \
     -DreleaseVersion=1.2.3 \
+    -Dtag=isis-1.2.3 \
     -DdevelopmentVersion=1.2.4-SNAPSHOT
 </code></pre>
 
+<p>where:</p>
+
+<ul>
+<li><code>releaseVersion</code> just strip off the <code>-SNAPSHOT</code> suffix:</li>
+<li><code>tag</code> should follow our <a href="release-branch-and-tag-names.html">standard</a> (concatenation of the <code>artifactId</code> and the version entered above <em>without a <code>-RCn</code> suffix</em>)</li>
+<li><code>developmentVersion</code> should increment as required, and have <code>-SNAPSHOT</code> appended.</li>
+</ul>
+
 <blockquote>
   <p>The <code>--batch-mode</code> argument can also, in theory, be added, but it's not clear (to me at least) how to enter the passphrase in this case.</p>
 </blockquote>
 
-<p>Or, f you want to be prompted for the versions, you can omit the properties, eg:</p>
+<p>Or, if you want to be prompted for the versions, you can omit the properties, eg:</p>
 
 <pre><code>mvn release:prepare -P apache-release -D dryRun=true
 </code></pre>
@@ -735,7 +743,7 @@ What is the release version for "Apache 
 1.2.3: :
 </pre>
 
-<p>If you didn't provide the <code>tag</code>, <code>releaseVersion</code> and <code>developmentVersion</code> tags, then you'll be prompted for them:</p>
+<p>If you didn't provide the <code>tag</code>, <code>releaseVersion</code> and <code>developmentVersion</code> tags, then you'll be prompted for them.</p>
 
 <ul>
 <li>For the first, release version, you can generally accept the default; Maven just strips off the <code>-SNAPSHOT</code> suffix:</li>