diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index be71e9d7d1..bcba4c1890 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -20,5 +20,15 @@
     <properties>
         <!-- TAS tests require an old version -->
         <dependency.org-json.version>20170516</dependency.org-json.version>
+
+<!-- Try the same versions of everything else to fix the tests - Some modules use diff versions. Better but test still fail. -->
+<!--        <dependency.commons-dbcp.version>1.4</dependency.commons-dbcp.version>-->
+<!--        <dependency.guava.version>23.0</dependency.guava.version>-->
+<!--        <dependency.commons-io.version>2.5</dependency.commons-io.version>-->
+<!--        <dependency.gson.version>2.8.5</dependency.gson.version>-->
+<!--        <dependency.httpclient.version>4.5.12</dependency.httpclient.version>-->
+<!--        <dependency.xercesImpl.version>2.12.0</dependency.xercesImpl.version>-->
+<!--        <dependency.postgresql.version>9.4.1211.jre7</dependency.postgresql.version>-->
+<!--        <dependency.mysql.version>5.1.18</dependency.mysql.version>-->
     </properties>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9e741cae09..30b7aab63d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,12 @@
         <dependency.bouncycastle.version>1.66</dependency.bouncycastle.version>
         <dependency.mockito-core.version>3.4.4</dependency.mockito-core.version>
         <dependency.org-json.version>20090211</dependency.org-json.version>
+        <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
+        <dependency.guava.version>28.2-jre</dependency.guava.version>
+        <dependency.commons-io.version>2.7</dependency.commons-io.version>
+        <dependency.gson.version>2.8.2</dependency.gson.version>
+        <dependency.httpclient.version>4.5.12</dependency.httpclient.version>
+        <dependency.xercesImpl.version>2.12.0-alfresco-patched-20191004</dependency.xercesImpl.version>
 
         <alfresco.googledrive.version>3.2.0</alfresco.googledrive.version>
         <alfresco.aos-module.version>1.3.1</alfresco.aos-module.version>
@@ -273,7 +279,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.7</version>
+                <version>${dependency.commons-io.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
@@ -304,12 +310,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.12</version>
+                <version>${dependency.httpclient.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient-cache</artifactId>
-                <version>4.5.12</version>
+                <version>${dependency.httpclient.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
@@ -509,7 +515,7 @@
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>2.12.0-alfresco-patched-20191004</version>
+                <version>${dependency.xercesImpl.version}</version>
             </dependency>
             <!-- Newer metadata-extractor, used in TIKA, see ACS-370 -->
             <dependency>
@@ -533,7 +539,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>28.2-jre</version>
+                <version>${dependency.guava.version}</version>
             </dependency>
             <!-- upgrade dependency from TIKA -->
             <dependency>
@@ -673,7 +679,12 @@
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>
-                <version>1.4-DBCP330</version>
+                <version>${dependency.commons-dbcp.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>${dependency.gson.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>