svn commit: r1061974 - in /websites/staging/commons/trunk/content: ./ releases/prepare.html

[bu...@apache.org]

Author: buildbot
Date: Wed Jun 17 23:49:21 2020
New Revision: 1061974

Log:
Staging update by buildbot for commons

Modified:
    websites/staging/commons/trunk/content/   (props changed)
    websites/staging/commons/trunk/content/releases/prepare.html

Propchange: websites/staging/commons/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 17 23:49:21 2020
@@ -1 +1 @@
-1878944
+1878945

Modified: websites/staging/commons/trunk/content/releases/prepare.html
==============================================================================
--- websites/staging/commons/trunk/content/releases/prepare.html (original)
+++ websites/staging/commons/trunk/content/releases/prepare.html Wed Jun 17 23:49:21 2020
@@ -895,7 +895,33 @@ mvn versions:display-plugin-updates -U</
 
       
 <div class="section">
+<h4><a name="Tag_Name_Convention"></a>Tag Name Convention<a name="Tag_Name_convention"></a></h4>
+      
+<p>
+        The naming of release candidates' tag for &quot;Commons&quot; projects should be done according to the following convention:
+      </p>
+      
+<div>
+<pre>
+        &lt;name&gt;-&lt;x.y[.z]&gt;[-beta&lt;m&gt;]-rc&lt;n&gt;
+      </pre></div>
+      
+<p>
+        where the <tt>name</tt> is the identifier of the component prefixed with <tt>commons-</tt>,
+        <tt>x.y[.z]</tt> is the version number,
+        the <tt>beta</tt> qualifier indicates a release that has no backwards compatibility requirements,
+        <tt>m</tt> is an integer indicating how many beta releases were created towards the upcoming version,
+        and <tt>n</tt> is an integer indicating how many releases candidates have been created.
+      </p>
+
+      </div>
+<div class="section">
 <h4>Manual Method<a name="Manual_Method"></a></h4>
+
+      
+<div class="section">
+<h5>Manual Method (SVN)<a name="Manual_Method_SVN"></a></h5>
+
         
 <p>Create a clean SVN workspace for the release candidate:</p>
       
@@ -941,25 +967,9 @@ mvn versions:display-plugin-updates -U</
         Also, by leaving trunk unchanged, nothing needs to be reverted if the RC vote fails and the Rc needs to be re-rolled.
       </p>
 
-      <b>Tagging with git</b>
-
-      
-<p>
-        The naming of release candidates' tag for &quot;Commons&quot; projects should be done according to the following convention:
-      </p>
-      
-<div>
-<pre>
-        &lt;name&gt;-&lt;x.y[.z]&gt;[-beta&lt;m&gt;]-rc&lt;n&gt;
-      </pre></div>
-      
-<p>
-        where the <tt>name</tt> is the identifier of the component prefixed with <tt>commons-</tt>,
-        <tt>x.y[.z]</tt> is the version number,
-        the <tt>beta</tt> qualifier indicates a release that has no backwards compatibility requirements,
-        <tt>m</tt> is an integer indicating how many beta releases were created towards the upcoming version,
-        and <tt>n</tt> is an integer indicating how many releases candidates have been created.
-      </p>
+      </div>
+<div class="section">
+<h5>Manual Method (Git)<a name="Manual_Method_Git"></a></h5>
 
       
 <p>
@@ -983,7 +993,7 @@ mvn versions:display-plugin-updates -U</
       git push -u origin/release
       </pre></div>
 
-      </div>
+      </div></div>
 <div class="section">
 <h4>Maven Release Plugin<a name="Maven_Release_Plugin"></a></h4>