Author: fhanik Date: Thu Aug 7 19:07:21 2014 New Revision: 1616569 URL: http://svn.apache.org/r1616569 Log: Clean up dependencies and advance snapshot version
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default tomcat/trunk/modules/jdbc-pool/pom.xml tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1616569&r1=1616568&r2=1616569&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/build.properties.default (original) +++ tomcat/trunk/modules/jdbc-pool/build.properties.default Thu Aug 7 19:07:21 2014 @@ -75,23 +75,15 @@ hamcrest.home=${base.path}/hamcrest-${ha hamcrest.jar=${hamcrest.home}/hamcrest-core-${hamcrest.version}.jar hamcrest.loc=http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar -c3p0.home=${base.path}/c3p0-0.9.1.2 -c3p0.jar=${c3p0.home}/lib/c3p0-0.9.1.2.jar -c3p0.loc=http://superb-east.dl.sourceforge.net/sourceforge/c3p0/c3p0-0.9.1.2.bin.zip - mysql.home=${base.path}/mysql-connector-java-5.1.12 mysql.jar=${mysql.home}/mysql-connector-java-5.1.12-bin.jar mysql.loc=http://mysql.mirrors.hoobly.com/Downloads/Connector-J/mysql-connector-java-5.1.12.zip -dbcp.home=${base.path}/commons-dbcp-1.3 -dbcp.jar=${dbcp.home}/commons-dbcp-1.3.jar -dbcp.loc=http://archive.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3.zip - -tomcat.version=6.0.32 +tomcat.version=8.0.9 tomcat.home=${base.path}/apache-tomcat-${tomcat.version} tomcat.dbcp.jar=${tomcat.home}/lib/tomcat-dbcp.jar tomcat.juli.jar=${tomcat.home}/bin/tomcat-juli.jar -tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip +tomcat.loc=http://archive.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip tomcat.project.loc=http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/project.xml tomcat.project.dest=${base.path}/project.xml Modified: tomcat/trunk/modules/jdbc-pool/pom.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/pom.xml?rev=1616569&r1=1616568&r2=1616569&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/pom.xml (original) +++ tomcat/trunk/modules/jdbc-pool/pom.xml Thu Aug 7 19:07:21 2014 @@ -27,7 +27,7 @@ <groupId>org.apache.tomcat</groupId> <artifactId>jdbc-pool</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.3-SNAPSHOT</version> <packaging>jar</packaging> <name>jdbc-pool</name> @@ -72,8 +72,8 @@ </dependency> <dependency> <groupId>org.apache.tomcat</groupId> - <artifactId>dbcp</artifactId> - <version>6.0.32</version> + <artifactId>tomcat-dbcp</artifactId> + <version>8.0.9</version> <scope>test</scope> </dependency> <dependency> Modified: tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=1616569&r1=1616568&r2=1616569&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java Thu Aug 7 19:07:21 2014 @@ -24,16 +24,11 @@ import java.util.Properties; import org.junit.After; import org.junit.Before; -//import org.apache.commons.dbcp2.BasicDataSource; -//import org.apache.commons.dbcp2.BasicDataSourceFactory; import org.apache.tomcat.dbcp.dbcp2.BasicDataSource; import org.apache.tomcat.dbcp.dbcp2.BasicDataSourceFactory; import org.apache.tomcat.jdbc.pool.PoolConfiguration; import org.apache.tomcat.jdbc.pool.PoolProperties; -//import com.mchange.v2.c3p0.ComboPooledDataSource; -//import com.mchange.v2.log.MLevel; -//import com.mchange.v2.log.MLog; /** * @version 1.0 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org