diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index fe795f29d4..3ee9651c6c 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -351,8 +351,8 @@
             <artifactId>commons-collections</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -585,7 +585,7 @@
 
 
         <dependency>
-            <groupId>postgresql</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
 		
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
index 4a746699ac..12050d75c7 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Locale;
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.dspace.core.ConfigurationManager;
@@ -322,11 +322,6 @@ public class DatabaseUtils
                 // NOTE: DatabaseLegacyReindexer only indexes in Legacy Lucene & RDBMS indexes. It can be removed once those are obsolete.
                 List<FlywayCallback> flywayCallbacks = new DSpace().getServiceManager().getServicesByType(FlywayCallback.class);
                 flywaydb.setCallbacks(flywayCallbacks.toArray(new FlywayCallback[flywayCallbacks.size()]));
-
-                // Set flyway callbacks (i.e. classes which are called post-DB migration and similar)
-                // In this situation, we have a Registry Updater that runs PRE-migration
-                // NOTE: DatabaseLegacyReindexer only indexes in Legacy Lucene & RDBMS indexes. It can be removed once those are obsolete.
-//                flywaydb.setCallbacks(new DatabaseRegistryUpdater(), new DatabaseLegacyReindexer());
             }
             catch(SQLException e)
             {
@@ -1142,4 +1137,12 @@ public class DatabaseUtils
         }
     }
 
+    /**
+     * In case of a unit test the flyway db is cached to long leading to exceptions, we need to clear the object
+     */
+    public static void clearFlywayDBCache()
+    {
+        flywaydb = null;
+    }
+
 }
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/core-test-hibernate.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/core-test-hibernate.xml
index 0a13fc9cb5..20e79f1761 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/core-test-hibernate.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/core-test-hibernate.xml
@@ -8,7 +8,7 @@
         <property name="dataSource" ref="dataSource" />
     </bean>
 
-    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
+    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close">
         <property name="driverClassName" value="org.h2.Driver"/>
         <property name="url" value="jdbc:h2:mem:test;LOCK_TIMEOUT=10000;MVCC=true"/>
         <property name="username" value="sa"/>
diff --git a/dspace-api/src/test/java/org/dspace/AbstractUnitTest.java b/dspace-api/src/test/java/org/dspace/AbstractUnitTest.java
index d1330c87f0..697eccffa6 100644
--- a/dspace-api/src/test/java/org/dspace/AbstractUnitTest.java
+++ b/dspace-api/src/test/java/org/dspace/AbstractUnitTest.java
@@ -109,6 +109,8 @@ public class AbstractUnitTest
             {
                 kernelImpl.start(ConfigurationManager.getProperty("dspace.dir"));
             }
+            //Clear our old flyway object
+            DatabaseUtils.clearFlywayDBCache();
             //Migrate & setup our database
             DatabaseUtils.main(new String[]{"migrate"});
 
diff --git a/dspace-rest/pom.xml b/dspace-rest/pom.xml
index c4cbfab061..977158ce08 100644
--- a/dspace-rest/pom.xml
+++ b/dspace-rest/pom.xml
@@ -107,11 +107,11 @@
 
         <!-- Connecting to DSpace datasource sets a dependency on Postgres DB-->
         <dependency>
-            <groupId>commons-dbcp</groupId>
-            <artifactId>commons-dbcp</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
         </dependency>
         <dependency>
-            <groupId>postgresql</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
index 6b19f5fe9b..a08b3d5f8c 100644
--- a/dspace-swordv2/pom.xml
+++ b/dspace-swordv2/pom.xml
@@ -81,7 +81,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>postgresql</groupId>
+                    <groupId>org.postgresql</groupId>
                     <artifactId>postgresql</artifactId>
                 </dependency>
             </dependencies>
diff --git a/dspace/config/spring/api/core-hibernate.xml b/dspace/config/spring/api/core-hibernate.xml
index f52d8a9129..7d01222b55 100644
--- a/dspace/config/spring/api/core-hibernate.xml
+++ b/dspace/config/spring/api/core-hibernate.xml
@@ -8,7 +8,7 @@
         <property name="dataSource" ref="dataSource" />
     </bean>
 
-    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" lazy-init="true" destroy-method="close">
+    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" lazy-init="true" destroy-method="close">
         <property name="driverClassName" value="${db.driver}"/>
         <property name="url" value="${db.url}"/>
         <property name="username" value="${db.username}"/>
diff --git a/dspace/modules/swordv2/pom.xml b/dspace/modules/swordv2/pom.xml
index 6b9739e7a7..4a662d88a1 100644
--- a/dspace/modules/swordv2/pom.xml
+++ b/dspace/modules/swordv2/pom.xml
@@ -82,7 +82,7 @@
          </activation>
          <dependencies>
             <dependency>
-               <groupId>postgresql</groupId>
+               <groupId>org.postgresql</groupId>
                <artifactId>postgresql</artifactId>
             </dependency>
          </dependencies>
diff --git a/pom.xml b/pom.xml
index 3253fc1a99..a1514e9772 100644
--- a/pom.xml
+++ b/pom.xml
@@ -972,9 +972,9 @@
             <!-- <version>3.1</version> xmlui - wing -->
          </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-discovery</groupId>
@@ -1153,9 +1153,9 @@
             <version>51.1</version>
          </dependency>
          <dependency>
-            <groupId>postgresql</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.1-901-1.jdbc4</version>
+            <version>9.4-1203-jdbc41</version>
          </dependency>
          <dependency>
             <groupId>com.oracle</groupId>