You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/07/11 17:52:56 UTC
[06/22] commons-collections git commit: Update for release 2.1.1
Update for release 2.1.1
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/branches/COLLECTIONS_2_1_BRANCH@131739 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/6e41136a
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/6e41136a
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/6e41136a
Branch: refs/heads/COLLECTIONS_2_1_BRANCH
Commit: 6e41136a144f22f7ad983d318d51ecf480d6e52d
Parents: 4cf2858
Author: Stephen Colebourne <sc...@apache.org>
Authored: Sat May 22 11:18:45 2004 +0000
Committer: Stephen Colebourne <sc...@apache.org>
Committed: Sat May 22 11:18:45 2004 +0000
----------------------------------------------------------------------
README.txt | 13 +++++++++++++
RELEASE-NOTES-2.1.1.html | 43 +++++++++++++++++++++++++++++++++++++++++++
build.xml | 14 +++++++++-----
3 files changed, 65 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/6e41136a/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index aeec14a..4905a97 100644
--- a/README.txt
+++ b/README.txt
@@ -4,6 +4,19 @@ Jakarta Commons Collections
Welcome to the Collections component of the Jakarta Commons
project.
+
+***********************************************************
+
+ This is a patch release of Commons Collections 2.1
+
+ This release has been created due to the discovery of
+ binary incompatibility between 2.1 and 3.0 in the
+ IteratorUtils class (sorry!).
+
+ See the release notes for more detail.
+
+***********************************************************
+
This component requires the excellent Ant utility. It can
be found here :
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/6e41136a/RELEASE-NOTES-2.1.1.html
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES-2.1.1.html b/RELEASE-NOTES-2.1.1.html
new file mode 100644
index 0000000..131164d
--- /dev/null
+++ b/RELEASE-NOTES-2.1.1.html
@@ -0,0 +1,43 @@
+<title>RELEASE NOTES: COLLECTIONS 2.1.1</title>
+
+<center><h2>RELEASE NOTES: COLLECTIONS 2.1.1</h2></center>
+
+<p>
+<b>This is a patch release of Commons Collections 2.1</b>
+</p>
+<p>
+The latest version of Commons Collections is 3.0.
+Unfortunately, the release of version 3.0 introduced a binary incompatibility
+with 2.1 in the <code>IteratorUtils</code> class. We apologise for this error.
+</p>
+<p>
+Regrettably, despite the issue being discovered by other teams, no feedback was
+given to the Commons Collections team, preventing a simple solution.
+<i>Please provide feedback to Commons Collections when you find issues like this!</i>
+</p>
+<p>
+This patch to Commons Collections is designed to allow version 2.1.1 to co-exist
+with version 3.0.1. The patch contains the following changes:
+<ul>
+<li>Deprecated <code>IteratorUtils.arrayIterator(...)</code> -
+ use <code>new ArrayIterator(...)</code> instead</li>
+<li>Deprecated <code>IteratorUtils.singletonIterator(...)</code> -
+ use <code>new SingletonIterator(...)</code> instead</li>
+<li>Deprecated <code>IteratorUtils.emptyIterator()</code> -
+ use <code>EmptyIterator.INSTANCE</code> instead</li>
+<li>Deprecated <code>IteratorUtils.emptyListIterator()</code> -
+ use <code>EmptyListIterator.INSTANCE</code> instead</li>
+<li>Deprecated <code>IteratorUtils.EMPTY_ITERATOR</code> -
+ use <code>EmptyIterator.INSTANCE</code> instead</li>
+<li>Deprecated <code>IteratorUtils.EMPTY_LIST_ITERATOR</code> -
+ use <code>EmptyIterator.INSTANCE</code> instead</li>
+<li>Added <code>EmptyIterator</code></li>
+<li>Added <code>EmptyListIterator</code></li>
+</ul>
+</p>
+<p>
+To make your code compatible with both 2.1.1 and 3.0.1 and later, remove all
+deprecation warnings from your code and re-release.
+If you have no deprecation warnings after installing this jar, your code is
+already compatible, and will run with versions 2.1, 2.1.1, 3.0, 3.0.1 and later.
+</p>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/6e41136a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4645ced..6c80100 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,4 @@
-<!-- $Id: build.xml,v 1.33 2002/10/21 00:33:59 bayard Exp $ -->
+<!-- $Id: build.xml,v 1.33.2.1 2004/05/22 11:18:45 scolebourne Exp $ -->
<project name="commons-collections" default="test" basedir=".">
<!-- patternset describing files to be copied from the doc directory -->
@@ -49,7 +49,7 @@
<property name="Name-Long" value="Jakarta Commons Collections Package"/>
<!-- The current version number of this component -->
- <property name="component.version" value="2.1"/>
+ <property name="component.version" value="2.1.1"/>
<property name="doc.release.notes" value="RELEASE-NOTES-${component.version}.html"/>
<property name="doc.status" value="STATUS.html"/>
@@ -88,7 +88,7 @@
</patternset>
<!-- set the cvs.root property in the build.properties file -->
- <property name="cvs.tag" value="COLLECTIONS_2_1"/>
+ <property name="cvs.tag" value="COLLECTIONS_2_1_1"/>
<available property="available-doc" file="${source.doc}"/> <!-- does this module have docs? -->
<available property="available-src-java" file="${source.src.java}"/> <!-- does this module have java src? -->
@@ -146,6 +146,8 @@
<target name="doc-top" depends="init">
<mkdir dir="${dest}"/>
<copy todir="${dest}" file="./LICENSE.txt"/>
+ <copy todir="${dest}" file="./NOTICE.txt"/>
+ <copy todir="${dest}" file="./README.txt"/>
<copy todir="${dest}" file="${doc.status}"/>
<copy todir="${dest}" file="${doc.release.notes}"/>
</target>
@@ -278,11 +280,11 @@
<tar longfile="gnu" tarfile="${dest.bin.tar}">
<tarfileset dir="${workdir}"/>
</tar>
-
<gzip zipfile="${dest.bin.tar.gz}"
src="${dest.bin.tar}">
</gzip>
<delete file="${dest.bin.tar}" />
+ <checksum file="${dest.bin.tar.gz}"/>
<delete dir="${workdir}"/>
@@ -301,6 +303,7 @@
<zip zipfile="${dest.bin.zip}" >
<zipfileset dir="${workdir}" />
</zip>
+ <checksum file="${dest.bin.zip}"/>
<delete dir="${workdir}"/>
@@ -328,16 +331,17 @@
<tar longfile="gnu" tarfile="${dest.src.tar}">
<tarfileset dir="${workdir}"/>
</tar>
-
<gzip zipfile="${dest.src.tar.gz}"
src="${dest.src.tar}">
</gzip>
<delete file="${dest.src.tar}" />
+ <checksum file="${dest.src.tar.gz}"/>
<!-- create a zip file -->
<zip zipfile="${dest.src.zip}" >
<zipfileset dir="${workdir}" />
</zip>
+ <checksum file="${dest.src.zip}"/>
<delete dir="${workdir}"/>