From b594b2fa6e92bd682a5de79af042c7b9a34ae862 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Thu, 10 Oct 2019 17:26:11 +0300
Subject: [PATCH 1/4] library updates to ones from ACS 6.1.1

---
 pom.xml                                |  7 ++++---
 rm-community/pom.xml                   |  6 +++---
 rm-community/rm-community-repo/pom.xml | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6aae1a9195..5b42e38c38 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>6.20</alfresco-spring-webscripts.version>
+      <alfresco-spring-webscripts.version>7.8</alfresco-spring-webscripts.version>
       <api.explorer.version>6.1.0</api.explorer.version>
       <!-- Set this here and override it in the community and enterprise modules. -->
       <alfresco.version>0.0</alfresco.version>
@@ -558,10 +558,11 @@
       <maven.resources.version>3.1.0</maven.resources.version>
       <maven.tomcat.port>8080</maven.tomcat.port>
 
-      <jackson.version>2.9.8</jackson.version>
+      <jackson.version>2.9.9</jackson.version>
+      <jackson-databind.version>2.9.9.3</jackson-databind.version>
       <fabric8.docker.version>0.25.0</fabric8.docker.version>
       <mockito.version>1.10.19</mockito.version>
-      <postgresql.version>42.2.5</postgresql.version>
+      <postgresql.version>42.2.6</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 1526902e18..81a8f870f2 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -57,7 +57,7 @@
          <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>${jackson-databind.version}</version>
          </dependency>
          <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -73,10 +73,10 @@
    </dependencyManagement>
 
    <properties>
-      <spring.version>5.1.1.RELEASE</spring.version>
+      <spring.version>5.1.8.RELEASE</spring.version>
 
       <alfresco.version>6.1.2-ga</alfresco.version>
-      <share.version>6.1.0</share.version>
+      <share.version>6.1.1</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/pom.xml b/rm-community/rm-community-repo/pom.xml
index 570059ae2b..8e17e960ac 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -24,11 +24,11 @@
       <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.0 changes -->
-      <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version>
-      <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
+      <!-- 6.1.1 changes -->
+      <dependency.alfresco-core.version>7.5.7.0</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>7.33.42.0</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>7.34.25.0</dependency.alfresco-remote-api.version>
+      <alfresco.alfresco-share-services.version>6.1.1</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
       <maven.javadoc.skip>false</maven.javadoc.skip>

From 2bd1429c0f0bd731c364761dcf0a6d0ff14ae802 Mon Sep 17 00:00:00 2001
From: Rodica Sutu <rodica.sutu@ness.com>
Date: Fri, 11 Oct 2019 12:53:00 +0300
Subject: [PATCH 2/4] revert the changes from community as there is no
 corresponding community release for ACS 6.1.1

---
 rm-community/pom.xml                   |  2 +-
 rm-community/rm-community-repo/pom.xml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 81a8f870f2..f8cd06fa74 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -76,7 +76,7 @@
       <spring.version>5.1.8.RELEASE</spring.version>
 
       <alfresco.version>6.1.2-ga</alfresco.version>
-      <share.version>6.1.1</share.version>
+      <share.version>6.1.0</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/pom.xml b/rm-community/rm-community-repo/pom.xml
index 8e17e960ac..6b347f17d4 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -24,11 +24,11 @@
       <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.1.1 changes -->
-      <dependency.alfresco-core.version>7.5.7.0</dependency.alfresco-core.version>
-      <dependency.alfresco-repository.version>7.33.42.0</dependency.alfresco-repository.version>
-      <dependency.alfresco-remote-api.version>7.34.25.0</dependency.alfresco-remote-api.version>
-      <alfresco.alfresco-share-services.version>6.1.1</alfresco.alfresco-share-services.version>
+      <!-- 6.1.2-ga changes -->
+      <dependency.alfresco-core.version>7.5.1</dependency.alfresco-core.version>
+      <dependency.alfresco-repository.version>7.33.12</dependency.alfresco-repository.version>
+      <dependency.alfresco-remote-api.version>7.34.1</dependency.alfresco-remote-api.version>
+      <alfresco.alfresco-share-services.version>6.1.0</alfresco.alfresco-share-services.version>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
 
       <maven.javadoc.skip>false</maven.javadoc.skip>

From 855212c7619de6146c27de98486b33388ab10625 Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Tue, 15 Oct 2019 08:17:48 +0300
Subject: [PATCH 3/4] Try to use docker build arguments

---
 pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5b42e38c38..387b3940f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,9 @@
       <!-- Profile used only to build docker images-->
       <profile>
          <id>buildDockerImage</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -289,6 +292,9 @@
       <!-- Profile used to build docker images with a specific tag and push them to the given image registry (quay.io)-->
       <profile>
          <id>internal</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -327,6 +333,9 @@
        hub.docker -->
       <profile>
          <id>master</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -371,6 +380,9 @@
       <!-- Profile used to build and push docker images with project.version tag to hub.docker when the enterprise deploy goal encounters-->
       <profile>
          <id>release-enterprise</id>
+         <properties>
+            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
+         </properties>
          <build>
             <pluginManagement>
                <plugins>

From c95ea4c2193a6c59d5e0df5dcfe84d77fffe833d Mon Sep 17 00:00:00 2001
From: cagache <claudia.agache@ness.com>
Date: Tue, 15 Oct 2019 09:11:32 +0300
Subject: [PATCH 4/4] Revert "Try to use docker build arguments"

This reverts commit 855212c7
---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 387b3940f1..5b42e38c38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,9 +253,6 @@
       <!-- Profile used only to build docker images-->
       <profile>
          <id>buildDockerImage</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -292,9 +289,6 @@
       <!-- Profile used to build docker images with a specific tag and push them to the given image registry (quay.io)-->
       <profile>
          <id>internal</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -333,9 +327,6 @@
        hub.docker -->
       <profile>
          <id>master</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>
@@ -380,9 +371,6 @@
       <!-- Profile used to build and push docker images with project.version tag to hub.docker when the enterprise deploy goal encounters-->
       <profile>
          <id>release-enterprise</id>
-         <properties>
-            <docker.buildArg.TOMCAT_DIR>/usr/local/tomcat</docker.buildArg.TOMCAT_DIR>
-         </properties>
          <build>
             <pluginManagement>
                <plugins>