Return-Path: X-Original-To: apmail-axis-java-commits-archive@minotaur.apache.org Delivered-To: apmail-axis-java-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CEE454F4B for ; Sat, 4 Jun 2011 16:27:11 +0000 (UTC) Received: (qmail 2130 invoked by uid 500); 4 Jun 2011 16:27:11 -0000 Delivered-To: apmail-axis-java-commits-archive@axis.apache.org Received: (qmail 2108 invoked by uid 500); 4 Jun 2011 16:27:11 -0000 Mailing-List: contact java-commits-help@axis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@axis.apache.org Delivered-To: mailing list java-commits@axis.apache.org Received: (qmail 2101 invoked by uid 99); 4 Jun 2011 16:27:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jun 2011 16:27:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Jun 2011 16:27:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8947823889ED; Sat, 4 Jun 2011 16:26:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1131426 - in /axis/axis2/java/core/branches/1_6: ./ src/site/xdoc/release-process.xml Date: Sat, 04 Jun 2011 16:26:50 -0000 To: java-commits@axis.apache.org From: veithen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110604162650.8947823889ED@eris.apache.org> 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).
  • Update the src/site/xdoc/index.xml file with a description of the release and add an entry for the release in src/site/xdoc/download.xml. 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.
  • + 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 + release archiving policy. 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. @@ -228,6 +233,7 @@ svn update
    1. Update the DOAP file (etc/doap_Axis2.rdf) and add a new entry for the release.
    2. Update the status of the release version in JIRA.
    3. +
    4. Remove archived releases from /www/www.apache.org/dist/axis on people.apache.org.