axis-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1130602 - in /axis/axis2/java/core/branches/1_6: ./ src/site/xdoc/release-process.xml
Date Thu, 02 Jun 2011 15:23:26 GMT
Author: veithen
Date: Thu Jun  2 15:23:26 2011
New Revision: 1130602

URL: http://svn.apache.org/viewvc?rev=1130602&view=rev
Log:
Merged r1130590 to the 1.6 branch for inclusion in the site for Axis2 1.6.1.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun  2 15:23:26 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590

Modified: axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml?rev=1130602&r1=1130601&r2=1130602&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml (original)
+++ axis/axis2/java/core/branches/1_6/src/site/xdoc/release-process.xml Thu Jun  2 15:23:26
2011
@@ -91,6 +91,7 @@
         <section name="Performing a release">
             <p><strong>Note:</strong> performing the release requires at
least Maven 2.1.0. The recommended version is 2.2.1.</p>
             <subsection name="Preparation">
+                <p>Verify that the code meets the basic requirements for being releasable:</p>
                 <ol>
                     <li>Check the consistency between the metadata in <tt>pom.xml</tt>
and <tt>modules/parent/pom.xml</tt>.
                     Since the root and parent POMs are different, some of the metadata is
duplicated and needs to be synchronized
@@ -102,9 +103,16 @@
                     <pre>mvn clean install -Papache-release -Dmaven.test.skip=true</pre></li>
                     <li>Check that the source distribution is buildable.</li>
                     <li>Check that the source tree is buildable with an empty local
Maven repository.</li>
-                    <li>Update the <tt>release-notes.html</tt> and <tt>src/site/xdoc/index.xml</tt>
files with a description
-                    of the release.</li>
-                    <li>Add an entry for the release in <tt>src/site/xdoc/download.xml</tt>.</li>
+                </ol>
+                <p>If any problems are detected, they should be fixed on the trunk
(except for issues specific to the
+                release branch) and then merged to the release branch.</p>
+                <p>Next update the relevant documents for the new release:</p>
+                <ol>
+                    <li>Update the <tt>release-notes.html</tt> file on
the release branch (since the content of this file is replaced
+                    with every release, there is no need to keep it in sync with the trunk,
except if the template changes).</li>
+                    <li>Update the <tt>src/site/xdoc/index.xml</tt> file
with a description of the release and add an entry for
+                    the release in <tt>src/site/xdoc/download.xml</tt>. To avoid
extra work for the RM doing the next major release,
+                    these changes should be done on the trunk first and then merged to the
release branch.</li>
                 </ol>
             </subsection>
             <subsection name="Pre-requisites">



Mime
View raw message