svn commit: r902492 - in /websites/staging/deltaspike/trunk/content: ./ steps_for_a_release.html

[bu...@apache.org]

Author: buildbot
Date: Thu Mar 20 08:00:19 2014
New Revision: 902492

Log:
Staging update by buildbot for deltaspike

Modified:
    websites/staging/deltaspike/trunk/content/   (props changed)
    websites/staging/deltaspike/trunk/content/steps_for_a_release.html

Propchange: websites/staging/deltaspike/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 20 08:00:19 2014
@@ -1 +1 @@
-1579556
+1579558

Modified: websites/staging/deltaspike/trunk/content/steps_for_a_release.html
==============================================================================
--- websites/staging/deltaspike/trunk/content/steps_for_a_release.html (original)
+++ websites/staging/deltaspike/trunk/content/steps_for_a_release.html Thu Mar 20 08:00:19 2014
@@ -205,16 +205,20 @@
 <p>If the binding majority approved the vote continue.</p>
 <ul>
 <li>Login to https://repository.apache.org/ and release the repository</li>
-<li>Merge release branch into master and push the branch and tag to the ASF repository (see below)</li>
+<li>Merge release branch into master and push the branch and tag to the ASF repository</li>
+</ul>
+<p>Always do a merge in this case (not a rebase):</p>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">checkout</span> <span class="n">master</span>
+<span class="n">git</span> <span class="n">merge</span> <span class="n">deltaspike</span><span class="o">-\</span><span class="p">[</span><span class="n">version</span><span class="o">\</span><span class="p">]</span>
+<span class="n">git</span> <span class="n">push</span> <span class="n">deltaspike</span><span class="o">-\</span><span class="p">[</span><span class="n">version</span><span class="o">\</span><span class="p">]</span>
+<span class="n">git</span> <span class="n">push</span> <span class="n">deltaspike</span><span class="o">-</span><span class="n">project</span><span class="o">-\</span><span class="p">[</span><span class="n">version</span><span class="o">\</span><span class="p">]</span>
+</pre></div>
+
+
+<ul>
 <li>Create the release at jira</li>
 <li>Close the corresponding tickets of the version</li>
-<li>
-<p>Wait some hours and check http://repo2.maven.org/maven2/org/apache/deltaspike</p>
-<p>git checkout master
-git merge deltaspike-[version]
-git push deltaspike-[version]
-git push deltaspike-project-[version]</p>
-</li>
+<li>Wait some hours and check http://repo2.maven.org/maven2/org/apache/deltaspike</li>
 </ul>
 <h2 id="upload-artifacts">Upload artifacts</h2>
 <p>TODO //add new procedure</p>