You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2013/06/30 23:26:42 UTC

svn commit: r1498185 - in /commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2: ./ RELEASE-NOTES.txt pom.xml src/site/xdoc/download_collections.xml src/site/xdoc/index.xml

Author: tn
Date: Sun Jun 30 21:26:42 2013
New Revision: 1498185

URL: http://svn.apache.org/r1498185
Log:
Creating Commons Collections v4.0-alpha1 RC2 tag.

Added:
    commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/
      - copied from r1498184, commons/proper/collections/trunk/
Modified:
    commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/RELEASE-NOTES.txt
    commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/pom.xml
    commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/download_collections.xml
    commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/index.xml

Modified: commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/RELEASE-NOTES.txt?rev=1498185&r1=1498184&r2=1498185&view=diff
==============================================================================
--- commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/RELEASE-NOTES.txt (original)
+++ commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/RELEASE-NOTES.txt Sun Jun 30 21:26:42 2013
@@ -1,6 +1,6 @@
 
               Apache Commons Collections
-                     Version 4.0
+                  Version 4.0-alpha1
                     RELEASE NOTES
 
 INTRODUCTION:

Modified: commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/pom.xml?rev=1498185&r1=1498184&r2=1498185&view=diff
==============================================================================
--- commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/pom.xml (original)
+++ commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/pom.xml Sun Jun 30 21:26:42 2013
@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-collections4</artifactId>
-  <version>4.0-SNAPSHOT</version>
+  <version>4.0-alpha1</version>
   <name>Commons Collections</name>
 
   <inceptionYear>2001</inceptionYear>
@@ -448,11 +448,19 @@
     <maven.compile.source>1.5</maven.compile.source>
     <maven.compile.target>1.5</maven.compile.target>
     
-    <!-- Need to change to collections4 when releasing -->
-    <commons.componentid>collections</commons.componentid>
+    <!--
+       This is also  used to generate download_xxx file name.
+       To override this when generating the download page:
+       
+       mvn commons:download-page -Dcommons.componentid=collections
+       
+       The above seems to change the download page name but not any other
+       properties that depend on the componentid.
+    -->
+    <commons.componentid>collections4</commons.componentid>
 
     <!-- Current 4.x release series: still points to old, set to 4.0 when releasing -->
-    <commons.release.version>3.2.1</commons.release.version>
+    <commons.release.version>4.0-alpha1</commons.release.version>
     <commons.release.desc>(Java 5.0+)</commons.release.desc>
     
     <!-- Previous 3.x release series -->
@@ -470,6 +478,10 @@
     <commons.site.path>collections</commons.site.path>
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-collections</commons.scmPubUrl>
     <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+    
+    <!-- Override javadoc plugin version due to a vulnerability of the generated javadoc
+         see http://jira.codehaus.org/browse/MJAVADOC-370, remove after update to CP 32   -->
+    <commons.javadoc.version>2.9.1</commons.javadoc.version>    
   </properties>
 
 

Modified: commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/download_collections.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/download_collections.xml?rev=1498185&r1=1498184&r2=1498185&view=diff
==============================================================================
--- commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/download_collections.xml (original)
+++ commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/download_collections.xml Sun Jun 30 21:26:42 2013
@@ -54,7 +54,7 @@ limitations under the License.
       <p>
         We recommend you use a mirror to download our release
         builds, but you <strong>must</strong> verify the integrity of
-        the downloaded files using signatures downloaded from our main 
+        the downloaded files using signatures downloaded from our main
         distribution directories. Recent releases (48 hours) may not yet
         be available from the mirrors.
       </p>
@@ -71,7 +71,7 @@ limitations under the License.
 
       <form action="[location]" method="get" id="SelectMirror">
         <p>
-          Other mirrors: 
+          Other mirrors:
           <select name="Preferred">
           [if-any http]
             [for http]<option value="[http]">[http]</option>[end]
@@ -90,12 +90,42 @@ limitations under the License.
       <p>
         The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
         link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. 
+        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
         The <code>MD5</code> link downloads the checksum from the main site.
       </p>
     </subsection>
     </section>
-    <section name="Commons Collections 3.2.1 ">
+    <section name="Commons Collections 4.0-alpha1 (Java 5.0+)">
+      <subsection name="Binaries">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.tar.gz">commons-collections4-4.0-alpha1-bin.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.zip">commons-collections4-4.0-alpha1-bin.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.0-alpha1-bin.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Source">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.0-alpha1-src.tar.gz">commons-collections4-4.0-alpha1-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/collections/source/commons-collections4-4.0-alpha1-src.zip">commons-collections4-4.0-alpha1-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.0-alpha1-src.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
+    <section name="Commons Collections 3.2.1 (Requires Java 1.2 or later)">
       <subsection name="Binaries">
         <table>
           <tr>

Modified: commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/index.xml?rev=1498185&r1=1498184&r2=1498185&view=diff
==============================================================================
--- commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/index.xml (original)
+++ commons/proper/collections/tags/COLLECTIONS_4_0_ALPHA1_RC2/src/site/xdoc/index.xml Sun Jun 30 21:26:42 2013
@@ -57,7 +57,8 @@ as are various <a href="project-reports.
 The JavaDoc API documents are available online:
 </p>
 <ul>
-<li>The <a href="javadocs/api-release/index.html">current release 3.2.1</a></li>
+<li>The <a href="javadocs/api-release/index.html">current release 4.0-alpha1</a></li>
+<li>The latest 3.x release - <a href="javadocs/api-3.2.1/index.html">version 3.2.1</a></li>
 <li>The latest 2.x release - <a href="javadocs/api-2.1.1/index.html">version 2.1.1</a></li>
 <li>The <a href="apidocs/index.html">latest SVN</a></li>
 </ul>
@@ -69,9 +70,9 @@ The <a href="source-repository.html">sub
 <!-- ================================================== -->
 <section name="Releases">
 <p>
-The latest version is v3.2.1 - 
+The latest version is v4.0-alpha1 - 
 <a href="http://commons.apache.org/collections/download_collections.cgi">Download now!</a><br />
-It is built for Java 1.5+ and the <a href="release_3_2_1.html">release notes</a> are also available.
+It is built for Java 1.5+ and the <a href="release_4_0.html">release notes</a> are also available.
 </p>
 <p>
 For previous releases, see the <a href="http://archive.apache.org/dist/commons/collections/">Apache Archive</a>