diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
index 72d432197..a70ae9f9d 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
@@ -5,7 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.jena;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 
 import org.apache.jena.query.Dataset;
 import org.apache.jena.sdb.SDBFactory;
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
index b91d2b035..720eb3329 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/GadgetSpec.java
@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 
 public class GadgetSpec {
 	private int appId = 0;
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
index 2b1f237a2..15bd13630 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java
@@ -18,7 +18,7 @@ import java.util.Map;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
index af4b36aa4..da11d447e 100644
--- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
+++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialSmokeTests.java
@@ -19,7 +19,7 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
 import edu.cornell.mannlib.vitro.webapp.utils.http.HttpClientFactory;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index ff30a008e..56e13c7bd 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -91,9 +91,9 @@
             <version>3.3.1</version>
         </dependency>
         <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>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -126,11 +126,6 @@
             <artifactId>commons-logging</artifactId>
             <version>1.1.1</version>
         </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>1.4</version>
-        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>