Author: veithen
Date: Sat Jun 4 16:26:50 2011
New Revision: 1131426
URL: http://svn.apache.org/viewvc?rev=1131426&view=rev
Log:
Merged r1131425 to the 1.6 branch for inclusion in the 1.6.1 site.
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 Sat Jun 4 16:26:50 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,1130590
+/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,1131425
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=1131426&r1=1131425&r2=1131426&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 Sat Jun
4 16:26:50 2011
@@ -112,7 +112,12 @@
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>
+ these changes should be done on the trunk first and then
merged to the release branch.
+ If the release is a maintenance release, then the previous
release from that branch must be prepared
+ for archiving by changing the links in the download page.
This is necessary to conform to the
+ <a
href="http://www.apache.org/dev/release.html#when-to-archive";>release archiving
policy</a>. If the release
+ is a major release, then this should be done with the
release from the oldest branch, unless it is expected
+ that users will still continue to download and use that
release.</li>
</ol>
</subsection>
<subsection name="Pre-requisites">
@@ -228,6 +233,7 @@ svn update</pre></li>
<ol>
<li>Update the DOAP file (<tt>etc/doap_Axis2.rdf</tt>) and
add a new entry for the release.</li>
<li>Update the status of the release version in JIRA.</li>
+ <li>Remove archived releases from
<tt>/www/www.apache.org/dist/axis</tt> on <tt>people.apache.org</tt>.</li>
</ol>
</subsection>
</section>
