Author: veithen
Date: Mon Dec 28 20:40:23 2015
New Revision: 1721995

URL: http://svn.apache.org/viewvc?rev=1721995&view=rev
Log:
Merge the latest release process documentation changes to the 1.6 branch.

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

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 28 20:40:23 2015
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
 
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222165,1222169,1222510,1225017,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1302297,1305728,1307410,1326968,1327005,1328228,1328231,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343027,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1488761,1488765,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,160884
 
3,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166,1721217,1721224-1721225,1721247,1721276-1721286,1721403,1721427,1721472-1721473,1721477,1721524,1721793,1721799,1721849,1721855-1721856
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
 
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222165,1222169,1222510,1225017,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1302297,1305728,1307410,1326968,1327005,1328228,1328231,1328733,1328921,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343027,1343353,1343543,1348340,1351218,1352413,1352423,1352428,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1373416,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1434104,1435330,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1488761,1488765,1509409,1509438,1510122,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,160884
 
3,1609578,1609866,1621171-1621172,1626559,1631608,1649688,1677432,1683827,1683831,1686316,1686321,1686538,1686544,1686553,1686630,1686643,1686742,1687894-1687895,1687902,1687961,1689172,1693147,1693802,1693808,1694744-1694745,1697181,1697205,1697514,1701352,1701354,1702667,1702678,1709481,1715061,1715078-1715079,1715120,1716056,1716061,1716316,1720279,1720477,1720650,1720653,1720675,1720683,1720700,1721025,1721062,1721075,1721145,1721157,1721166,1721217,1721224-1721225,1721247,1721276-1721286,1721403,1721427,1721472-1721473,1721477,1721524,1721793,1721799,1721849,1721855-1721856,1721908,1721986,1721992

Modified: axis/axis2/java/core/branches/1_6/src/site/markdown/release-process.md
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/markdown/release-process.md?rev=1721995&r1=1721994&r2=1721995&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/src/site/markdown/release-process.md 
(original)
+++ axis/axis2/java/core/branches/1_6/src/site/markdown/release-process.md Mon 
Dec 28 20:40:23 2015
@@ -93,44 +93,28 @@ Release process overview
 Performing a release
 --------------------
 
-**Note:** performing the release requires at least Maven 2.1.0. The 
recommended version is 2.2.1.
-
 ### Preparation
 
 Verify that the code meets the basic requirements for being releasable:
 
-1.  Check the consistency between the metadata in `pom.xml` and 
`modules/parent/pom.xml`.
-    Since the root and parent POMs are different, some of the metadata is 
duplicated and needs to be synchronized
-    manually. This includes the mailing list addresses, issue tracker 
information, SCM location, etc.
-
-2.  Check that the set of legal (`legal/*.LICENSE`) files corresponds to the 
set of third party
+1.  Check that the set of legal (`legal/*.LICENSE`) files corresponds to the 
set of third party
     JARs included in the binary distribution.
 
-3.  Check that the `apache-release` profile works correctly and produces the 
required distributions.
+2.  Check that the `apache-release` profile works correctly and produces the 
required distributions.
     The profile can be executed as follows:
     
-        mvn clean install -Papache-release -Dmaven.test.skip=true
+        mvn clean install -Papache-release
 
-4.  Check that the source distribution is buildable.
+3.  Check that the source distribution is buildable.
 
-5.  Check that the source tree is buildable with an empty local Maven 
repository.
+4.  Check that the source tree is buildable with an empty local Maven 
repository.
 
 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.
 
-Next update the relevant documents for the new release:
-
-1.  Update the `release-notes.html` 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).
-
-2.  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.
-    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](http://www.apache.org/dev/release.html#when-to-archive). 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.
+Next update the release note found under `src/site/markdown/release-notes`. 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.
 
 ### Pre-requisites
 
@@ -172,51 +156,50 @@ The following things are required to per
 
 In order to prepare the release artifacts for vote, execute the following 
steps:
 
-1.  Update the release date in `release-notes.html`, `src/site/xdoc/index.xml` 
and
-    `src/site/xdoc/download.xml`. Since it is not possible to predict the 
exact date when the
-    release is officially announced, this should be the date when the release 
tag is created.
-
-2.  Temporarily disable the Hudson build(s) for Axis2, in order to avoid 
accidental deployment of the release
-    candidate to the local repository of a Hudson executor if the release 
process fails somewhere in the middle and/or
-    a Hudson build starts at the wrong moment.
-
-3.  Start the release process using the following command:
-
-        mvn release:prepare -Peverything
-
-    When asked for a tag name, use the following format: `vX.Y.Z`. The 
`everything` profile
-    makes sure that the version numbers of all Maven modules are incremented 
properly.
-    The execution of the `release:prepare` goal may fail for users in
-    locations that use the EU Subversion server. If this happens,
-    wait for a minute (so that the EU server can catch up with its master) and 
simply rerun the command.
+1.  Start the release process using the following command:
+
+        mvn release:prepare
+
+    When asked for a tag name, accept the default value (in the following 
format: `vX.Y.Z`).
+    The execution of the `release:prepare` goal may occasionally fail because 
`svn.apache.org`
+    resolves to one of the geolocated SVN mirrors and there is a propagation 
delay between
+    the master and these mirrors. If this happens,
+    wait for a minute (so that the mirrors can catch up with the master) and 
simply rerun the command.
     It will continue where the error occurred.
 
-4.  Perform the release using the following command:
+2.  Perform the release using the following command:
 
         mvn release:perform
 
-5.  Login to Nexus and close the staging repository. For more details about 
this step, see
+3.  Login to Nexus and close the staging repository. For more details about 
this step, see
     
[here](https://docs.sonatype.org/display/Repository/Closing+a+Staging+Repository).
 
-6.  Deploy the distributions to your `public_html` area on `people.apache.org`.
-    The `release:perform` goal should have produced all the necessary files in 
the
-    `target/checkout/target/axis2-<version>-dists` folder. Please 
preserve the directory structure and
-    file names because they exactly match the requirements for deployment to 
`www.apache.org`
-    (see below).
-
-7.  Generate and deploy the Maven site to your `public_html` area on 
`people.apache.org`
-    (either by building the site locally and transfer the files to 
`people.apache.org`, or by
-    checking out the release tag and building the site directly on 
`people.apache.org`).
+4.  Execute the `target/checkout/etc/dist.py` script to upload the 
distributions.
+
+5.  Create a staging area for the Maven site:
+
+        svn cp https://svn.apache.org/repos/asf/axis/site/axis2/java/core \
+               
https://svn.apache.org/repos/asf/axis/site/axis2/java/core-staging
+
+6.  Change to the `target/checkout` directory and prepare the site using the 
following commands:
 
-8.  Start the release vote by sending a mail to `[email protected]`.
+        mvn site-deploy
+        mvn scm-publish:publish-scm -Dscmpublish.skipCheckin=true
+
+    Now go to the `target/scmpublish-checkout` directory (relative to 
`target/checkout`) and check that there
+    are no unexpected changes to the site. Then commit the changes.
+    Note that this may fail because of 
[INFRA-11007](https://issues.apache.org/jira/browse/INFRA-11007).
+    In this case, switch to the Subversion master using the following command 
before trying to commit again:
+
+        svn switch --relocate https://svn.apache.org/ 
https://svn-master.apache.org/
+
+7.  Start the release vote by sending a mail to `[email protected]`.
     The mail should mention the following things:
 
-    *   The list of issues solved in the release (by linking to the relevant 
JIRA view).
     *   A link to the Nexus staging repository.
-    *   The URL on `people.apache.org` where the distributions can be 
downloaded.
-    *   A link to the preview of the Maven site.
-
-9.  Reenable the Hudson build(s).
+    *   A link to the directory containing the distributions
+        (<https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/x.y.x/>).
+    *   A link to the preview of the Maven site 
(<http://axis.apache.org/axis2/java/core-staging/>).
 
 If the vote passes, execute the following steps:
 
@@ -224,21 +207,18 @@ If the vote passes, execute the followin
     
[here](https://docs.sonatype.org/display/Repository/Releasing+a+Staging+Repository)
     for detailed instructions for this step.
 
-2.  Login to `people.apache.org` and copy the distributions (including the 
checksums and
-    signatures) to `/www/www.apache.org/dist/axis/axis2/java/core/`. If you 
followed the
-    steps described above, then you should already have everything that is 
needed in your `public_html`
-    folder and you only need to copy the `X.Y.Z` folder to the right location. 
Please execute the
-    copy with umask 0002 and check that the files and directories have the 
right permissions (write access for the
-    `axis` group).
-
-3.  Check out the current Axis2 site from 
<https://svn.apache.org/repos/asf/axis/site/axis2/java/core/>
-    and synchronize it with the site for the new release. The site should have 
been generated during the
-    release build and can be found in the `target/checkout/target/site`. 
Alternatively you can
-    check out the release tag and rebuild the site using `mvn site`, or 
extract it from the
-    documents distribution. Axiom has a script (see `etc/syncsite.py`) that 
can be used to
-    synchronize the site in Subversion. It takes care of executing the 
relevant `svn add`
-    and `svn remove` commands on the local working copy of the site.
-    The live Web site is updated automatically by svnpubsub once the changes 
have been committed to SVN.
+2.  Publish the distributions:
+
+        svn mv 
https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/x.y.z \
+               https://dist.apache.org/repos/dist/release/axis/axis2/java/core/
+
+3.  Publish the site:
+
+        svn co --depth=immediates 
https://svn.apache.org/repos/asf/axis/site/axis2/java/ axis2-site
+        cd axis2-site
+        svn rm core
+        svn mv core-staging core
+        svn commit
 
 It may take several hours before everything has been synchronized. Before 
proceeding, check that
 
@@ -259,4 +239,6 @@ of Axis2, because not everybody subscrib
 
 2.  Update the status of the release version in JIRA.
 
-3.  Remove archived releases from `/www/www.apache.org/dist/axis` on 
`people.apache.org`.
+3.  Remove old (archived) releases from 
<https://dist.apache.org/repos/dist/dev/axis/axis2/java/core/>.
+
+4.  Create an empty release note for the next release under 
`src/site/markdown/release-notes`.


Reply via email to