Author: kkolinko Date: Fri Mar 22 08:58:12 2013 New Revision: 1459673 URL: http://svn.apache.org/r1459673 Log: jdbc-pool tests need JUnit 4. Use the same version of junit as used by Tomcat.
Modified: tomcat/trunk/build.properties.default tomcat/trunk/modules/jdbc-pool/build.properties.default Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1459673&r1=1459672&r2=1459673&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Fri Mar 22 08:58:12 2013 @@ -181,7 +181,7 @@ commons-daemon.native.src.loc.2=${base-c commons-daemon.native.win.loc.1=${base-commons.loc.1}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip commons-daemon.native.win.loc.2=${base-commons.loc.2}/daemon/binaries/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip -# ----- JUnit Unit Test Suite, version 3.7 or later ----- +# ----- JUnit Unit Test Suite, version 4.8 or later ----- junit.home=${base.path}/junit4.8.2 junit.lib=${junit.home} junit.jar=${junit.lib}/junit-4.8.2.jar Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1459673&r1=1459672&r2=1459673&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/build.properties.default (original) +++ tomcat/trunk/modules/jdbc-pool/build.properties.default Fri Mar 22 08:58:12 2013 @@ -62,11 +62,11 @@ testdb.validationQuery=SELECT 1 #testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver #testdb.validationQuery=VALUES 1 -# ----- JUnit Unit Test Suite, version 3.7 or later ----- -junit.home=${base.path}/junit3.8.2 +# ----- JUnit Unit Test Suite, version 4.8 or later ----- +junit.home=${base.path}/junit4.8.2 junit.lib=${junit.home} -junit.jar=${junit.lib}/junit.jar -junit.loc=http://downloads.sourceforge.net/junit/junit3.8.2.zip +junit.jar=${junit.lib}/junit-4.8.2.jar +junit.loc=http://cloud.github.com/downloads/KentBeck/junit/junit4.8.2.zip c3p0.home=${base.path}/c3p0-0.9.1.2 c3p0.jar=${c3p0.home}/lib/c3p0-0.9.1.2.jar --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org