svn commit: r1660213 - in /commons/proper/dbcp/trunk: build.properties.sample build.xml

[ps...@apache.org]

Author: psteitz
Date: Mon Feb 16 21:50:04 2015
New Revision: 1660213

URL: http://svn.apache.org/r1660213
Log:
Restored Ant build.

Modified:
    commons/proper/dbcp/trunk/build.properties.sample
    commons/proper/dbcp/trunk/build.xml

Modified: commons/proper/dbcp/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=1660213&r1=1660212&r2=1660213&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.properties.sample (original)
+++ commons/proper/dbcp/trunk/build.properties.sample Mon Feb 16 21:50:04 2015
@@ -23,13 +23,14 @@
 # Repository base path
 repository=${user.home}/.m2/repository
 
-# commons-pool.jar - path to commons-pool2-2.2
-commons-pool.home=${repository}/org/apache/commons/commons-pool2/2.2
-commons-pool.jar=${commons-pool.home}/commons-pool2-2.2.jar
+# commons-pool.jar - path to commons-pool2-2.3
+commons-pool.home=${repository}/org/apache/commons/commons-pool2/2.3
+commons-pool.jar=${commons-pool.home}/commons-pool2-2.3.jar
 
 # JUnit
 junit.home=${repository}/junit/junit/4.11
 junit.jar=${junit.home}/junit-4.11.jar
+hamcrest.jar=${repository}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
 
 # XML parser
 xerces.home=${repository}/xerces/xercesImpl/2.4.0

Modified: commons/proper/dbcp/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.xml?rev=1660213&r1=1660212&r2=1660213&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/build.xml (original)
+++ commons/proper/dbcp/trunk/build.xml Mon Feb 16 21:50:04 2015
@@ -38,7 +38,7 @@
 
       <!-- now combine the classpaths -->
       <property name="classpath" 
-       value="${cp}:${commons-pool.jar}:${junit.jar}:
+       value="${cp}:${commons-pool.jar}:${junit.jar}:${hamcrest.jar}:
         ${naming-common.jar}:${naming-java.jar}:${commons-logging.jar}:
         ${jta-spec.jar}:${jta-impl.jar}:
         ${backport-util-concurrent.jar}:${ejb-spec.jar}"/>
@@ -64,7 +64,7 @@
       <property name="test.runner" value="junit.textui.TestRunner" /> 
      
       <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
-      <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy; 2001-2014 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
+      <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy; 2001-2015 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
       <property name="javadoc.overview" value="${basedir}/src/main/java/org/apache/commons/dbcp2/overview.html"/>
 
       <property name="javac.optimize" value="false"/>
@@ -194,6 +194,8 @@
           <pathelement location="${build.test-classes.dir}" /> 
           <pathelement path="${classpath}" /> 
         </classpath>
+      	<sysproperty key="org.apache.commons.logging.Log" 
+      	   	               value="org.apache.commons.dbcp2.StackMessageLog"/>
         <formatter type="plain" usefile="true" />
         <!-- If test.entry is defined, run a single test, otherwise run all valid tests -->
         <test name="${test.entry}" if="test.entry"/>