DBCP no longer requires commons-collections. Removed used lib from build.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@783696 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index b5aa205..02190bd 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -77,13 +77,6 @@ commons-dbcp-src.loc=http://people.apache.org/~markt/dev/commons-dbcp-r734404-sr
 commons-pool.home=${base.path}/commons-pool-1.4-src
 commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
 
-# ----- Commons Collections, version 2.0 or later -----
-commons-collections.home=${base.path}/commons-collections-3.2-src
-commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
-commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
-
 # ----- NSIS, version 2.0 or later -----
 nsis.home=${base.path}/nsis-2.44
 nsis.exe=${nsis.home}/makensis.exe

diff --git a/build.xml b/build.xml
index b0a3040..8eddd2b 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -741,10 +741,6 @@
 
     <!-- Build Tomcat DBCP bundle -->
     <antcall target="downloadgz">
-      <param name="sourcefile" value="${commons-collections-src.loc}"/>
-      <param name="destfile" value="${tomcat-dbcp.jar}" />
-    </antcall>
-    <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-pool-src.loc}"/>
       <param name="destfile" value="${tomcat-dbcp.jar}" />
     </antcall>