From 253ac04b782615bfa10f7d4240762688dd47342a Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Wed, 15 Apr 2020 10:58:33 +0300
Subject: [PATCH 1/5] Update AGS with the latest ACS 6.2.1 dependencies

(cherry picked from commit c950a08cb44108135896d4eaba6d2fcb37eafb3d)
---
 pom.xml                                   | 8 ++++----
 rm-community/pom.xml                      | 6 +++---
 rm-community/rm-community-repo/Dockerfile | 2 +-
 rm-community/rm-community-repo/pom.xml    | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc8f9182b9..140b0892d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -532,7 +532,7 @@
       <alfresco.groupId>org.alfresco</alfresco.groupId>
       <alfresco.share.artifactId>share</alfresco.share.artifactId>
       <alfresco-spring-webscripts.version>7.9</alfresco-spring-webscripts.version>
-      <api.explorer.version>6.2.0</api.explorer.version>
+      <api.explorer.version>6.3.0</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.min.version>0.0</alfresco.min.version>
 
@@ -558,11 +558,11 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.9.9</jackson.version>
-      <jackson-databind.version>2.9.10.1</jackson-databind.version>
+      <jackson.version>2.10.2</jackson.version>
+      <jackson-databind.version>2.10.1</jackson-databind.version>
       <fabric8.docker.version>0.31.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
-      <postgresql.version>42.2.6</postgresql.version>
+      <postgresql.version>42.2.12</postgresql.version>
       <postgresql.port>5432</postgresql.port>
       <mysql.version>5.1.40</mysql.version>
       <mysql.port>3306</mysql.port>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index ecd13ebaab..a58a07a196 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -73,9 +73,9 @@
    </dependencyManagement>
 
    <properties>
-      <spring.version>5.1.8.RELEASE</spring.version>
-
-      <alfresco.version>6.2.0-ga</alfresco.version>
+      <spring.version>5.2.2.RELEASE</spring.version>
+      <alfresco.min.version>6.2.0</alfresco.min.version>
+      <alfresco.version>6.3.0-A5</alfresco.version>
       <alfresco.min.version>6.1</alfresco.min.version>
       <share.version>6.2.0</share.version>
       <!-- The properties app.amp.* need to be set for share to work. -->
diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index 3baa1cdb53..5987d9d04e 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,5 +1,5 @@
 ### Apply AGS community repo AMP to ACS image
-FROM alfresco/alfresco-content-repository-community:6.2.0-ga
+FROM alfresco/alfresco-content-repository-community:6.3.0-A5
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 1594c58433..1f725a059d 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -25,9 +25,9 @@
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
       <!-- 6.2.0-ga changes -->
-      <dependency.alfresco-core.version>7.22</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>7.134.1</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>7.107.1</dependency.alfresco-remote-api.version>
+      <dependency.alfresco-core.version>8.18</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>8.83</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>8.82</dependency.alfresco-remote-api.version>
       <alfresco.alfresco-share-services.version>6.2.0</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 

From f5bfff97baa1c0ee70275a0aca570e4f5f0cc722 Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Tue, 21 Apr 2020 15:39:43 +0300
Subject: [PATCH 2/5] update the ACS version to 6.2.1-A2

---
 pom.xml                                | 2 +-
 rm-community/pom.xml                   | 5 ++---
 rm-community/rm-community-repo/pom.xml | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 140b0892d3..205d1dddaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,7 +558,7 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.10.2</jackson.version>
+      <jackson.version>2.10.3</jackson.version>
       <jackson-databind.version>2.10.1</jackson-databind.version>
       <fabric8.docker.version>0.31.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index a58a07a196..de980e92b0 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -73,9 +73,8 @@
    </dependencyManagement>
 
    <properties>
-      <spring.version>5.2.2.RELEASE</spring.version>
-      <alfresco.min.version>6.2.0</alfresco.min.version>
-      <alfresco.version>6.3.0-A5</alfresco.version>
+      <spring.version>5.2.5.RELEASE</spring.version>
+      <alfresco.version>6.2.1-A2</alfresco.version>
       <alfresco.min.version>6.1</alfresco.min.version>
       <share.version>6.2.0</share.version>
       <!-- The properties app.amp.* need to be set for share to work. -->
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 1f725a059d..4f6902fa5a 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -24,10 +24,10 @@
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
-      <!-- 6.2.0-ga changes -->
-      <dependency.alfresco-core.version>8.18</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>8.83</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>8.82</dependency.alfresco-remote-api.version>
+      <!-- 6.2.1-A2 changes -->
+      <dependency.alfresco-core.version>7.30</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>7.164</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>7.122</dependency.alfresco-remote-api.version>
       <alfresco.alfresco-share-services.version>6.2.0</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 

From 1cd2b1c72f77a5a79eefd3c4bc327ba1d3576e0d Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Tue, 21 Apr 2020 18:45:40 +0300
Subject: [PATCH 3/5] update docker files with ACS 6.2.1-A2

---
 rm-community/rm-community-repo/.env       | 2 +-
 rm-community/rm-community-repo/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/.env b/rm-community/rm-community-repo/.env
index 06ce42f8df..9ae38b9688 100644
--- a/rm-community/rm-community-repo/.env
+++ b/rm-community/rm-community-repo/.env
@@ -1,4 +1,4 @@
-TRANSFORMERS_TAG=2.1.0
+TRANSFORMERS_TAG=2.2.0-A4
 SOLR6_TAG=1.4.0
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index 5987d9d04e..3059d3d7ec 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,5 +1,5 @@
 ### Apply AGS community repo AMP to ACS image
-FROM alfresco/alfresco-content-repository-community:6.3.0-A5
+FROM alfresco/alfresco-content-repository-community:6.2.1-A2
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.

From c8fce7e60c0b9d40b811412900200e93923fff13 Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Sun, 26 Apr 2020 21:34:44 +0300
Subject: [PATCH 4/5] updates to ACS 6.2.1-RC3

---
 pom.xml                                   | 8 +++++---
 rm-community/pom.xml                      | 6 +++---
 rm-community/rm-community-repo/.env       | 4 ++--
 rm-community/rm-community-repo/Dockerfile | 2 +-
 rm-community/rm-community-repo/pom.xml    | 8 ++++----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 205d1dddaa..16ba41e285 100644
--- a/pom.xml
+++ b/pom.xml
@@ -531,7 +531,7 @@
       <alfresco.db.username>alfresco</alfresco.db.username>
       <alfresco.groupId>org.alfresco</alfresco.groupId>
       <alfresco.share.artifactId>share</alfresco.share.artifactId>
-      <alfresco-spring-webscripts.version>7.9</alfresco-spring-webscripts.version>
+      <alfresco-spring-webscripts.version>8.2</alfresco-spring-webscripts.version>
       <api.explorer.version>6.3.0</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.min.version>0.0</alfresco.min.version>
@@ -591,7 +591,9 @@
       <image.tag>latest</image.tag>
       <image.registry>quay.io</image.registry>
 
-      <javax-jaxb.version>2.3.0</javax-jaxb.version>
+      <javax-jaxb.version>2.4.0-b180830.0359</javax-jaxb.version>
+      <javax-jaxb-impl.version>3.0.0-M1</javax-jaxb-impl.version>
+      <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
       <apache-compress.version>1.19</apache-compress.version>
    </properties>
 
@@ -644,7 +646,7 @@
       <dependency>
          <groupId>com.sun.xml.bind</groupId>
          <artifactId>jaxb-impl</artifactId>
-         <version>${javax-jaxb.version}</version>
+         <version>${javax-jaxb-impl.version}</version>
          <scope>provided</scope>
       </dependency>
 
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index de980e92b0..6ccdcb7ed0 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -74,9 +74,9 @@
 
    <properties>
       <spring.version>5.2.5.RELEASE</spring.version>
-      <alfresco.version>6.2.1-A2</alfresco.version>
-      <alfresco.min.version>6.1</alfresco.min.version>
-      <share.version>6.2.0</share.version>
+      <alfresco.version>6.2.1-RC1</alfresco.version>
+      <alfresco.min.version>6.2.1</alfresco.min.version>
+      <share.version>6.2.1-RC1</share.version>
       <!-- The properties app.amp.* need to be set for share to work. -->
       <app.filtering.enabled>true</app.filtering.enabled>
    </properties>
diff --git a/rm-community/rm-community-repo/.env b/rm-community/rm-community-repo/.env
index 9ae38b9688..6c1cea2f92 100644
--- a/rm-community/rm-community-repo/.env
+++ b/rm-community/rm-community-repo/.env
@@ -1,5 +1,5 @@
-TRANSFORMERS_TAG=2.2.0-A4
-SOLR6_TAG=1.4.0
+TRANSFORMERS_TAG=2.2.0-A5
+SOLR6_TAG=1.4.2-RC3
 POSTGRES_TAG=11.4
 ACTIVEMQ_TAG=5.15.8
 LEGACY_TRANSFORM_SERVICE_ENABLED=true
diff --git a/rm-community/rm-community-repo/Dockerfile b/rm-community/rm-community-repo/Dockerfile
index 3059d3d7ec..54a0d460f1 100644
--- a/rm-community/rm-community-repo/Dockerfile
+++ b/rm-community/rm-community-repo/Dockerfile
@@ -1,5 +1,5 @@
 ### Apply AGS community repo AMP to ACS image
-FROM alfresco/alfresco-content-repository-community:6.2.1-A2
+FROM alfresco/alfresco-content-repository-community:6.2.1-RC1
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 4f6902fa5a..505f9f0b1a 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -25,10 +25,10 @@
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
       <!-- 6.2.1-A2 changes -->
-      <dependency.alfresco-core.version>7.30</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>7.164</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>7.122</dependency.alfresco-remote-api.version>
-      <alfresco.alfresco-share-services.version>6.2.0</alfresco.alfresco-share-services.version>
+      <dependency.alfresco-core.version>7.31</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>7.171</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>7.125</dependency.alfresco-remote-api.version>
+      <alfresco.alfresco-share-services.version>6.2.1-RC1</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
       <maven.javadoc.skip>false</maven.javadoc.skip>

From 8e821c4804c26f78fe6befd518abf88baaa5f5b7 Mon Sep 17 00:00:00 2001
From: rodicasutu <rodica.sutu@ness.com>
Date: Mon, 27 Apr 2020 07:49:12 +0300
Subject: [PATCH 5/5] minorr changes to complete previous work

---
 rm-community/rm-community-repo/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 505f9f0b1a..8658e81f86 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -24,7 +24,7 @@
       <alfresco.repo.artifactId>alfresco-platform</alfresco.repo.artifactId>
       <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
       <ags.artifactId>alfresco-governance-services-community-repo</ags.artifactId>
-      <!-- 6.2.1-A2 changes -->
+      <!-- 6.2.1-RC1 changes -->
       <dependency.alfresco-core.version>7.31</dependency.alfresco-core.version>
       <dependency.alfresco-repository.version>7.171</dependency.alfresco-repository.version>
       <dependency.alfresco-remote-api.version>7.125</dependency.alfresco-remote-api.version>