azkaban-developers

diff --git a/azkaban-common/build.gradle b/azkaban-common/build.gradle
index da495e9..0bb8c07 100644
--- a/azkaban-common/build.gradle
+++ b/azkaban-common/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 
   compile('com.google.guava:guava:13.0.1')
   compile('commons-collections:commons-collections:3.2.2')
-  compile('commons-dbcp:commons-dbcp:1.4')
+  compile('org.apache.commons:commons-dbcp2:2.1.1')
   compile('commons-dbutils:commons-dbutils:1.5')
   compile('commons-fileupload:commons-fileupload:1.2.1')
   compile('commons-io:commons-io:2.4')

diff --git a/azkaban-common/src/main/java/azkaban/database/AzkabanDataSource.java b/azkaban-common/src/main/java/azkaban/database/AzkabanDataSource.java
index 19ce67c..46a27e6 100644
--- a/azkaban-common/src/main/java/azkaban/database/AzkabanDataSource.java
+++ b/azkaban-common/src/main/java/azkaban/database/AzkabanDataSource.java
@@ -16,7 +16,7 @@
 
 package azkaban.database;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 
 public abstract class AzkabanDataSource extends BasicDataSource {
   public abstract boolean allowsOnDuplicateKey();

diff --git a/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java b/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
index b884c71..19b8991 100644
--- a/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
+++ b/azkaban-common/src/main/java/azkaban/database/DataSourceUtils.java
@@ -137,7 +137,7 @@ public class DataSourceUtils {
       setUsername(user);
       setPassword(password);
       setUrl(url);
-      setMaxActive(numConnections);
+      setMaxTotal(numConnections);
       setValidationQuery("/* ping */ select 1");
       setTestOnBorrow(true);
     }