svn commit: r1799631 - in /commons/proper/configuration/trunk: pom.xml src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java

[ggregory]

Author: ggregory
Date: Thu Jun 22 21:54:37 2017
New Revision: 1799631

URL: http://svn.apache.org/viewvc?rev=1799631&view=rev
Log:
Update tests from Apache Commons DBCP 1.4 to 2.2.1 and POOL from 1.6 to 2.4.2 
(DBCP depends on POOL). Local build OK.

Modified:
    commons/proper/configuration/trunk/pom.xml
    
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java

Modified: commons/proper/configuration/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1799631&r1=1799630&r2=1799631&view=diff
==============================================================================
--- commons/proper/configuration/trunk/pom.xml (original)
+++ commons/proper/configuration/trunk/pom.xml Thu Jun 22 21:54:37 2017
@@ -388,16 +388,16 @@
     <!-- Needed for testing -->
 
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>1.4</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
-      <version>1.6</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+      <version>2.4.2</version>
       <scope>test</scope>
     </dependency>
 

Modified: 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java?rev=1799631&r1=1799630&r2=1799631&view=diff
==============================================================================
--- 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
 (original)
+++ 
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
 Thu Jun 22 21:54:37 2017
@@ -28,7 +28,7 @@ import org.apache.commons.configuration2
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.apache.commons.configuration2.test.HsqlDB;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.dbunit.database.DatabaseConnection;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.IDataSet;