Author: schor
Date: Wed Jan 16 17:01:00 2013
New Revision: 1434037

URL: http://svn.apache.org/viewvc?rev=1434037&view=rev
Log:
no jira - tweak the release procedure to avoid using the distribution svn for 
release candidates.

Modified:
    uima/site/trunk/uima-website/docs/checklist-release.html
    uima/site/trunk/uima-website/docs/release.html
    uima/site/trunk/uima-website/docs/saving-svn-resources.html
    uima/site/trunk/uima-website/xdocs/checklist-release.xml
    uima/site/trunk/uima-website/xdocs/release.xml
    uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml

Modified: uima/site/trunk/uima-website/docs/checklist-release.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/checklist-release.html?rev=1434037&r1=1434036&r2=1434037&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/checklist-release.html (original)
+++ uima/site/trunk/uima-website/docs/checklist-release.html Wed Jan 16 
17:01:00 2013
@@ -230,11 +230,10 @@
     depend on the release version of previous steps.  When you're done, you 
will have 1 or more
     "closed" staging repositories, each having a unique URL.
   </li-->
-  <li>Copy any artifacts (together with their signings) to the distribution 
SVN staging repo,
-  https://dist.apache.org/repos/dist/dev/uima.  For release which include 
eclipse-update-site
-  packagings, this should include any modifications to the update site or 
subsites (see
+  <li>Copy any artifacts (together with their signings) to the staging spot.  
This is typically
+  in your people.apache.org/~[userid]/public_html directory. For releases 
which include eclipse-update-site
+  packagings, this should include any modifications to the composite update 
site or subsites (see
   <a href="/eclipse-update-site.html">eclipse-update-site</a>.
-  Do this in a manner to <a href="saving-svn-resources.html">minimize SVN 
space</a> use, if possible.  
   </li>
   <li>Send [VOTE] message to dev list.  List the staging repository that 
testers
     will need to add to their <code>settings.xml</code> files, and the 
distribution SVN repo link.</li>
@@ -242,7 +241,8 @@
   <li>Delete any artifacts from the staging repo that aren't supposed to go to 
Maven Central
       (currently only the bin.tar artifacts - the bin.zip is used for building 
uima-as)</li>
   <li>Promote the release(s) from the staging repositories</li>
-  <li>svn move the approved artifacts in the distribution repo from the 
dev/uima spot to the release/uima spot.</li>
+  <li>Add the approved staged artifacts to the release/uima spot: log onto 
people.a.o and do an svn add
+  of the actual staged signed artifacts.</li>
   <li>update the UIMA website docs/d with any generated docs, in a manner to 
   <a href="saving-svn-resources.html">minimize SVN space</a> use, if possible.
 This includes: PDFs, HTML versions of docbooks plus the index.html; all go on 
the
@@ -255,8 +255,8 @@ This includes: PDFs, HTML versions of do
   <!-- li>Copy released artifacts to targets: bin, src, 
p.a.o/www/www.apache.org/dist/uima. <u>TEMPORARY:</u>
       Copy the updated composite repository from 
eclipse-packagings/eclipse-update-site to 
.../dist/uima/eclipse-update-site.</li-->
   <li>Copy RELEASE_NOTES and issuesFixed
-      from uimaj/target/checkout (where
-      the mvn release:perform was done from) to the UIMA web site in 
doc/d/[project-version].</li>
+      from the .../target/checkout where
+      the mvn release:perform was done from to the UIMA web site in 
doc/d/[project-version].</li>
   <li>Update the downloads page of the web site</li>
   <li>Update Jira version info to reflect the release status and date</li>
   <li>Cleanup the SVN tag for the release candidate, removing any -rcXX, to 
indicate the release.</li>

Modified: uima/site/trunk/uima-website/docs/release.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/release.html?rev=1434037&r1=1434036&r2=1434037&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/release.html (original)
+++ uima/site/trunk/uima-website/docs/release.html Wed Jan 16 17:01:00 2013
@@ -632,12 +632,24 @@ mvn install -Papache-release</pre>
       <tr><td>
         <blockquote class="subsectionBody">
                                     <p>
-  Copy all the artifacts to be released via the Apache mirror system to their 
positions in the
-  distribution SVN: https://dist.apache.org/repos/dist/dev/uima spot.  
-  Use the 
-  <a href="saving-svn-resources.html">saving-svn-space</a> tricks if 
reasonable. Typically, for each release, we create a new directory for that, 
and place
+  Note that any JARs, Zips, Tars, tar.gz artifacts must be signed by the 
Release Manager.
+  </p>
+                                                <p>
+  Although we have a spot in the distribution SVN under dev/uima for all the 
artifacts to be released
+  via the Apache mirror system, you probably should not use this for
+  release candidates, unless you suspect there won't be many of these (or 
they're small).  This is because
+  SVN retains forever all the files you put into it, so if we go through 8 
release candidates, each having 
+  several multi-megabyte zip/tar files, these will just waste space in SVN. 
+  </p>
+                                                <p>
+  The alternative is to stage the release candidate in your personal 
people.apache.org/~[user-id] space, and
+  let testers/voters pull it from there.
+  </p>
+                                                <p>If you do use the 
distribution SVN for the release candidates, 
+  follow the 
+  <a href="saving-svn-resources.html">saving-svn-space</a> tricks if 
reasonable. 
+  Typically, for each release, we create a new directory for that, and place
   all files pertaining to that release underneath that directory.
-  Note that any JARs, Zips, Tars, tar.gz artifacts need to be signed.
   </p>
                             </blockquote>
         </td></tr>
@@ -756,25 +768,35 @@ mvn install -Papache-release</pre>
         <li>Promote the release(s) from the staging repositories: 
             log on to the staging repository again, and release the staged 
artifacts.  
             This will make the artifacts available in the Maven Central 
repository.</li>
-        <li><p>SVN move the release artifacts from the distribution SVN 
staging spot
-        in dev/uima to release/uima.  
+        <li><p>If the release candidate used the distribution (...dev/uima) 
spot, 
+        SVN move the release artifacts from the distribution SVN staging spot
+        in dev/uima to release/uima.  Otherwise, log on to people.a.o and do 
+        SVN add of the voted-on artifacts from the place where they were 
staged.
+        </p> 
+          
       <!-- 
        (which are merged with
       the existing previous plugin releases already on the update site).  
        -->
-      If Eclipse plugins are being released, the updated composite update site 
is 
-      promoted to the release/uima directory.
-      Make sure the KEYS file in that uploaded directory is current (master 
located in 
-      SVN uima/site/trunk/uima-website/docs/KEYS). Additionally it is 
necessary to update
+       <p>
+      If Eclipse plugins are being released, promote any changed files to the 
release/uima directory.
+       </p>
+       <p>
+      Make sure the KEYS file in release/uima is current (master located in 
+      SVN uima/site/trunk/uima-website/docs/KEYS). 
+      </p>
+      
+      <p>Update
       the download page of the UIMA website to make the new release artifacts 
available.
       This is done indirectly, by editing both the downloads.xml page and also 
by
       adding entries to the xdocs/stylesheets/project.xml page - follow the 
previous examples.</p>
+      
       </li>
       <li>Things not needed to be mirrored go into our website:
         in the docs/d directory.
         Currently, this includes the RELEASE_NOTES (plus issuesFixed) for the 
release,
         the new docbooks, and the Javadocs.  Arrange to update these in a way 
that
-        preserves SVN resources.</li>
+        <a href="saving-svn-resources.html">preserves SVN resources</a>.</li>
       
       <li>Copy RELEASE_NOTES and issuesFixed
       from the top level project (where

Modified: uima/site/trunk/uima-website/docs/saving-svn-resources.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/saving-svn-resources.html?rev=1434037&r1=1434036&r2=1434037&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/saving-svn-resources.html (original)
+++ uima/site/trunk/uima-website/docs/saving-svn-resources.html Wed Jan 16 
17:01:00 2013
@@ -186,7 +186,7 @@
       Whenever reasonable, please conserve SVN resources, using various 
approaches.
       </p>
                                                 <ul>
-<li>Arrange to have files which don't change from release to release shared 
within the SVN.</li>
+<li>Arrange to have files, which don't change from release to release, shared 
within the SVN.</li>
 <li>Arrange to have files which change minimally, and which are "text", to 
take advantage of 
 SVN storage of differences between versions</li>
 </ul>

Modified: uima/site/trunk/uima-website/xdocs/checklist-release.xml
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/checklist-release.xml?rev=1434037&r1=1434036&r2=1434037&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/checklist-release.xml (original)
+++ uima/site/trunk/uima-website/xdocs/checklist-release.xml Wed Jan 16 
17:01:00 2013
@@ -79,11 +79,10 @@ under the License.
     depend on the release version of previous steps.  When you're done, you 
will have 1 or more
     "closed" staging repositories, each having a unique URL.
   </li-->
-  <li>Copy any artifacts (together with their signings) to the distribution 
SVN staging repo,
-  https://dist.apache.org/repos/dist/dev/uima.  For release which include 
eclipse-update-site
-  packagings, this should include any modifications to the update site or 
subsites (see
+  <li>Copy any artifacts (together with their signings) to the staging spot.  
This is typically
+  in your people.apache.org/~[userid]/public_html directory. For releases 
which include eclipse-update-site
+  packagings, this should include any modifications to the composite update 
site or subsites (see
   <a href="/eclipse-update-site.html">eclipse-update-site</a>.
-  Do this in a manner to <a href="saving-svn-resources.html">minimize SVN 
space</a> use, if possible.  
   </li>
   <li>Send [VOTE] message to dev list.  List the staging repository that 
testers
     will need to add to their <code>settings.xml</code> files, and the 
distribution SVN repo link.</li>
@@ -91,7 +90,8 @@ under the License.
   <li>Delete any artifacts from the staging repo that aren't supposed to go to 
Maven Central
       (currently only the bin.tar artifacts - the bin.zip is used for building 
uima-as)</li>
   <li>Promote the release(s) from the staging repositories</li>
-  <li>svn move the approved artifacts in the distribution repo from the 
dev/uima spot to the release/uima spot.</li>
+  <li>Add the approved staged artifacts to the release/uima spot: log onto 
people.a.o and do an svn add
+  of the actual staged signed artifacts.</li>
   <li>update the UIMA website docs/d with any generated docs, in a manner to 
   <a href="saving-svn-resources.html">minimize SVN space</a> use, if possible.
 This includes: PDFs, HTML versions of docbooks plus the index.html; all go on 
the
@@ -104,8 +104,8 @@ This includes: PDFs, HTML versions of do
   <!-- li>Copy released artifacts to targets: bin, src, 
p.a.o/www/www.apache.org/dist/uima. <u>TEMPORARY:</u>
       Copy the updated composite repository from 
eclipse-packagings/eclipse-update-site to 
.../dist/uima/eclipse-update-site.</li-->
   <li>Copy RELEASE_NOTES and issuesFixed
-      from uimaj/target/checkout (where
-      the mvn release:perform was done from) to the UIMA web site in 
doc/d/[project-version].</li>
+      from the .../target/checkout where
+      the mvn release:perform was done from to the UIMA web site in 
doc/d/[project-version].</li>
   <li>Update the downloads page of the web site</li>
   <li>Update Jira version info to reflect the release status and date</li>
   <li>Cleanup the SVN tag for the release candidate, removing any -rcXX, to 
indicate the release.</li>

Modified: uima/site/trunk/uima-website/xdocs/release.xml
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/release.xml?rev=1434037&r1=1434036&r2=1434037&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/release.xml (original)
+++ uima/site/trunk/uima-website/xdocs/release.xml Wed Jan 16 17:01:00 2013
@@ -341,12 +341,25 @@ mvn install -Papache-release</pre>
   
   <subsection name="Copying release artifacts to staging spot">
   <p>
-  Copy all the artifacts to be released via the Apache mirror system to their 
positions in the
-  distribution SVN: https://dist.apache.org/repos/dist/dev/uima spot.  
-  Use the 
-  <a href="saving-svn-resources.html">saving-svn-space</a> tricks if 
reasonable. Typically, for each release, we create a new directory for that, 
and place
+  Note that any JARs, Zips, Tars, tar.gz artifacts must be signed by the 
Release Manager.
+  </p>
+  <p>
+  Although we have a spot in the distribution SVN under dev/uima for all the 
artifacts to be released
+  via the Apache mirror system, you probably should not use this for
+  release candidates, unless you suspect there won't be many of these (or 
they're small).  This is because
+  SVN retains forever all the files you put into it, so if we go through 8 
release candidates, each having 
+  several multi-megabyte zip/tar files, these will just waste space in SVN. 
+  </p>
+  <p>
+  The alternative is to stage the release candidate in your personal 
people.apache.org/~[user-id] space, and
+  let testers/voters pull it from there.
+  </p>
+ 
+ <p>If you do use the distribution SVN for the release candidates, 
+  follow the 
+  <a href="saving-svn-resources.html">saving-svn-space</a> tricks if 
reasonable. 
+  Typically, for each release, we create a new directory for that, and place
   all files pertaining to that release underneath that directory.
-  Note that any JARs, Zips, Tars, tar.gz artifacts need to be signed.
   </p>
   </subsection>
 
@@ -473,25 +486,35 @@ mvn install -Papache-release</pre>
         <li>Promote the release(s) from the staging repositories: 
             log on to the staging repository again, and release the staged 
artifacts.  
             This will make the artifacts available in the Maven Central 
repository.</li>
-        <li><p>SVN move the release artifacts from the distribution SVN 
staging spot
-        in dev/uima to release/uima.  
+        <li><p>If the release candidate used the distribution (...dev/uima) 
spot, 
+        SVN move the release artifacts from the distribution SVN staging spot
+        in dev/uima to release/uima.  Otherwise, log on to people.a.o and do 
+        SVN add of the voted-on artifacts from the place where they were 
staged.
+        </p> 
+          
       <!-- 
        (which are merged with
       the existing previous plugin releases already on the update site).  
        -->
-      If Eclipse plugins are being released, the updated composite update site 
is 
-      promoted to the release/uima directory.
-      Make sure the KEYS file in that uploaded directory is current (master 
located in 
-      SVN uima/site/trunk/uima-website/docs/KEYS). Additionally it is 
necessary to update
+       <p>
+      If Eclipse plugins are being released, promote any changed files to the 
release/uima directory.
+       </p>
+       <p>
+      Make sure the KEYS file in release/uima is current (master located in 
+      SVN uima/site/trunk/uima-website/docs/KEYS). 
+      </p>
+      
+      <p>Update
       the download page of the UIMA website to make the new release artifacts 
available.
       This is done indirectly, by editing both the downloads.xml page and also 
by
       adding entries to the xdocs/stylesheets/project.xml page - follow the 
previous examples.</p>
+      
       </li>
       <li>Things not needed to be mirrored go into our website:
         in the docs/d directory.
         Currently, this includes the RELEASE_NOTES (plus issuesFixed) for the 
release,
         the new docbooks, and the Javadocs.  Arrange to update these in a way 
that
-        preserves SVN resources.</li>
+        <a href="saving-svn-resources.html">preserves SVN resources</a>.</li>
       
       <li>Copy RELEASE_NOTES and issuesFixed
       from the top level project (where

Modified: uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml?rev=1434037&r1=1434036&r2=1434037&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml (original)
+++ uima/site/trunk/uima-website/xdocs/saving-svn-resources.xml Wed Jan 16 
17:01:00 2013
@@ -34,7 +34,7 @@
       Whenever reasonable, please conserve SVN resources, using various 
approaches.
       </p>
       <ul>
-<li>Arrange to have files which don't change from release to release shared 
within the SVN.</li>
+<li>Arrange to have files, which don't change from release to release, shared 
within the SVN.</li>
 <li>Arrange to have files which change minimally, and which are "text", to 
take advantage of 
 SVN storage of differences between versions</li>
 </ul>


Reply via email to