svn commit: r1224682 - in /tomcat/trunk: build.properties.default build.xml

[kk...@apache.org]

Author: kkolinko
Date: Mon Dec 26 06:49:35 2011
New Revision: 1224682

URL: http://svn.apache.org/viewvc?rev=1224682&view=rev
Log:
Update to commons-pool 1.5.7.
Fix build condition for tomcat-dbcp to always rebuild when a new version of pool or dbcp is downloaded.

Modified:
    tomcat/trunk/build.properties.default
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1224682&r1=1224681&r2=1224682&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Mon Dec 26 06:49:35 2011
@@ -147,7 +147,7 @@ commons-dbcp-src.loc.1=${base-commons.lo
 commons-dbcp-src.loc.2=${base-commons.loc.2}/dbcp/source/commons-dbcp-${commons-dbcp.version}-src.tar.gz
 
 # ----- Commons Pool, version 1.1 or later -----
-commons-pool.version=1.5.6
+commons-pool.version=1.5.7
 commons-pool.home=${base.path}/commons-pool-${commons-pool.version}-src
 commons-pool-src.loc.1=${base-commons.loc.1}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz
 commons-pool-src.loc.2=${base-commons.loc.2}/pool/source/commons-pool-${commons-pool.version}-src.tar.gz

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1224682&r1=1224681&r2=1224682&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Dec 26 06:49:35 2011
@@ -2235,10 +2235,14 @@ Apache Tomcat ${version} native binaries
       <param name="destfile" value="${commons-dbcp.home}/build.xml" />
     </antcall>
     <mkdir dir="${tomcat-dbcp.home}"/>
+    <!-- Rebuild dbcp only if built jars do not exist -->
+    <!-- or new versions of pool or dbcp have been downloaded. -->
     <condition property="no.build.dbcp">
       <and>
-        <available file="${tomcat-dbcp.jar}"/>
-        <available file="${tomcat-dbcp-src.jar}"/>
+        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
+        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
+        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
+        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
       </and>
     </condition>
     <antcall target="build-tomcat-dbcp" />



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org