From 6bee748adacb041b9d408e03a57e9c3a99e0d0e3 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 6 May 2021 10:33:11 +0100
Subject: [PATCH 1/4] Align community pom with what is on master: mockito-core
 3.9.0 and tas-restapi 1.58

[ags]
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 49118ca99b..cbb6c4bd9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
         <dependency.webscripts.version>8.18</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.68</dependency.bouncycastle.version>
-        <dependency.mockito-core.version>3.8.0</dependency.mockito-core.version>
+        <dependency.mockito-core.version>3.9.0</dependency.mockito-core.version>
         <dependency.mockito-all.version>1.10.19</dependency.mockito-all.version>
         <dependency.org-json.version>20210307</dependency.org-json.version>
         <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
@@ -114,7 +114,7 @@
         <dependency.mariadb.version>2.7.2</dependency.mariadb.version>
         <dependency.tas-utility.version>3.0.44</dependency.tas-utility.version>
         <dependency.rest-assured.version>3.3.0</dependency.rest-assured.version>
-        <dependency.tas-restapi.version>1.57</dependency.tas-restapi.version>
+        <dependency.tas-restapi.version>1.58</dependency.tas-restapi.version>
         <dependency.tas-cmis.version>1.29</dependency.tas-cmis.version>
         <dependency.tas-email.version>1.8</dependency.tas-email.version>
         <dependency.tas-webdav.version>1.6</dependency.tas-webdav.version>

From 03c6710357f77672d7d0981230ed5bf0f681bb98 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 6 May 2021 11:05:04 +0100
Subject: [PATCH 2/4] Downgrade junit 4.13.1 gson 2.8.5 Use default
 commons-collections4 4.4 rather than 4.1.2 [ags]

---
 .../rm-automation-community-rest-api/pom.xml             | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
index 57c7f29cbd..23035745e0 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -81,10 +81,11 @@
          <artifactId>alfresco-testng</artifactId>
          <version>1.1</version>
       </dependency>
-      <dependency>
-         <groupId>org.apache.commons</groupId>
-         <artifactId>commons-collections4</artifactId>
-      </dependency>
+<!-- should be pulled in by alfresco-repository and org.apache.poi.poi:jar:4.1.2 -->
+<!--      <dependency>-->
+<!--         <groupId>org.apache.commons</groupId>-->
+<!--         <artifactId>commons-collections4</artifactId>-->
+<!--      </dependency>-->
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java</artifactId>

From 7e1f900083cd64cce08f7b14b93e6ae6c7ef308b Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 6 May 2021 11:09:13 +0100
Subject: [PATCH 3/4] Downgrade gson 2.8.5 [ags]

---
 pom.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index cbb6c4bd9e..58c5968695 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
         <dependency.org-json.version>20210307</dependency.org-json.version>
         <dependency.commons-dbcp.version>1.4-DBCP330</dependency.commons-dbcp.version>
         <dependency.commons-io.version>2.8.0</dependency.commons-io.version>
-        <dependency.gson.version>2.8.6</dependency.gson.version>
+        <dependency.gson.version>2.8.5</dependency.gson.version>
         <dependency.httpclient.version>4.5.13</dependency.httpclient.version>
         <dependency.httpcore.version>4.4.14</dependency.httpcore.version>
         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
@@ -652,11 +652,12 @@
                 <artifactId>commons-csv</artifactId>
                 <version>1.8</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-collections4</artifactId>
-                <version>4.2</version>
-            </dependency>
+<!-- should be pulled in by alfresco-repository and org.apache.poi.poi:jar:4.1.2 -->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.commons</groupId>-->
+<!--                <artifactId>commons-collections4</artifactId>-->
+<!--                <version>4.2</version>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>org.postgresql</groupId>
@@ -731,7 +732,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.13.2</version>
+                <version>4.13.1</version>
             </dependency>
             <dependency>
                 <groupId>org.antlr</groupId>

From 4bc9d8025354505a021fe3080e923dbf087602b5 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Thu, 6 May 2021 12:21:45 +0100
Subject: [PATCH 4/4] commons-collections4 in AGS only

---
 .../rm-automation-community-rest-api/pom.xml           | 10 +++++-----
 amps/ags/rm-community/rm-community-repo/pom.xml        |  1 -
 pom.xml                                                |  6 ------
 repository/pom.xml                                     |  1 -
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
index 23035745e0..1ab5cd0070 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -81,11 +81,11 @@
          <artifactId>alfresco-testng</artifactId>
          <version>1.1</version>
       </dependency>
-<!-- should be pulled in by alfresco-repository and org.apache.poi.poi:jar:4.1.2 -->
-<!--      <dependency>-->
-<!--         <groupId>org.apache.commons</groupId>-->
-<!--         <artifactId>commons-collections4</artifactId>-->
-<!--      </dependency>-->
+      <dependency>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-collections4</artifactId>
+         <version>4.4</version>
+      </dependency>
       <dependency>
          <groupId>com.github.docker-java</groupId>
          <artifactId>docker-java</artifactId>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index 78659bef50..6325f8daf0 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -90,7 +90,6 @@
       <dependency>
          <groupId>org.reflections</groupId>
          <artifactId>reflections</artifactId>
-         <version>0.9.12</version>
          <scope>test</scope>
       </dependency>
       <!-- swagger parser -->
diff --git a/pom.xml b/pom.xml
index 58c5968695..b6600996b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,12 +652,6 @@
                 <artifactId>commons-csv</artifactId>
                 <version>1.8</version>
             </dependency>
-<!-- should be pulled in by alfresco-repository and org.apache.poi.poi:jar:4.1.2 -->
-<!--            <dependency>-->
-<!--                <groupId>org.apache.commons</groupId>-->
-<!--                <artifactId>commons-collections4</artifactId>-->
-<!--                <version>4.2</version>-->
-<!--            </dependency>-->
 
             <dependency>
                 <groupId>org.postgresql</groupId>
diff --git a/repository/pom.xml b/repository/pom.xml
index 2be77ad9a3..d55b911bb6 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -865,7 +865,6 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>