From 9f4fc89a8c8aa7aa5db89d5628a0ecf06fa2b165 Mon Sep 17 00:00:00 2001
From: "meenal.bhave@alfresco.com" <meenal.bhave@alfresco.com>
Date: Tue, 10 Sep 2019 09:59:07 +0100
Subject: [PATCH 1/4] Search:1835: Updated RM artifacts' names and versions

---
 e2e-test/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index b0d9d7147..8bc984e89 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -14,7 +14,7 @@
       <tas.rest.api.version>6.0.1.2</tas.rest.api.version>
       <tas.cmis.api.version>6.0.0.4</tas.cmis.api.version>
       <tas.utility.version>3.0.11</tas.utility.version>
-      <rm.version>2.6.0</rm.version>
+      <rm.version>3.1.0</rm.version>
       <suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
       <test.exclude></test.exclude>
       <test.include></test.include>
@@ -77,7 +77,7 @@
       </dependency>
       <dependency>
          <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-rm-automation-enterprise-rest-api</artifactId>
+         <artifactId>alfresco-governance-services-automation-enterprise-rest-api</artifactId>
          <version>${rm.version}</version>
          <scope>test</scope>
       </dependency>
@@ -88,7 +88,7 @@
        </dependency>
       <dependency>
          <groupId>org.alfresco</groupId>
-         <artifactId>alfresco-rm-automation-community-rest-api</artifactId>
+         <artifactId>alfresco-governance-services-automation-community-rest-api</artifactId>
          <version>${rm.version}</version>
          <classifier>tests</classifier>
          <scope>test</scope>

From 925c590e95a73b93d24974b546d4791f47822474 Mon Sep 17 00:00:00 2001
From: "meenal.bhave@alfresco.com" <meenal.bhave@alfresco.com>
Date: Tue, 10 Sep 2019 10:36:17 +0100
Subject: [PATCH 2/4] Search:1835: Allow share image location to be specified,
 to enable running GS share

---
 search-services/packaging/src/docker/6.x/.env               | 1 +
 search-services/packaging/src/docker/6.x/docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/search-services/packaging/src/docker/6.x/.env b/search-services/packaging/src/docker/6.x/.env
index 37cd93f01..e4e98f347 100644
--- a/search-services/packaging/src/docker/6.x/.env
+++ b/search-services/packaging/src/docker/6.x/.env
@@ -1,6 +1,7 @@
 # In order to start the community edition set the value of ALFRESCO_IMAGE to alfresco/alfresco-content-repository-community
 ALFRESCO_IMAGE=alfresco/alfresco-content-repository
 ALFRESCO_TAG=6.1.0-EA3
+SHARE_IMAGE=alfresco/alfresco-share
 SHARE_TAG=6.0
 POSTGRES_TAG=10.1
 SEARCH_TAG=latest
\ No newline at end of file
diff --git a/search-services/packaging/src/docker/6.x/docker-compose.yml b/search-services/packaging/src/docker/6.x/docker-compose.yml
index 5b07ec59b..b7e4c3bbc 100644
--- a/search-services/packaging/src/docker/6.x/docker-compose.yml
+++ b/search-services/packaging/src/docker/6.x/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - "5005:5005" #Java debugging
       - "8081:8080" #Browser port for Alfresco
   share:
-    image: alfresco/alfresco-share:${SHARE_TAG}
+    image: ${SHARE_IMAGE}:${SHARE_TAG}
     environment:
       - REPO_HOST=alfresco
       - REPO_PORT=8080

From c970a773440c865168daba91dc95b3bd9bea0996 Mon Sep 17 00:00:00 2001
From: "meenal.bhave@alfresco.com" <meenal.bhave@alfresco.com>
Date: Tue, 10 Sep 2019 15:18:20 +0100
Subject: [PATCH 3/4] Search:1835: Amended the image location to be from
 quay.io explicitely, for consistency

---
 search-services/packaging/src/docker/6.x/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/search-services/packaging/src/docker/6.x/.env b/search-services/packaging/src/docker/6.x/.env
index e4e98f347..f23d97f96 100644
--- a/search-services/packaging/src/docker/6.x/.env
+++ b/search-services/packaging/src/docker/6.x/.env
@@ -1,7 +1,7 @@
 # In order to start the community edition set the value of ALFRESCO_IMAGE to alfresco/alfresco-content-repository-community
-ALFRESCO_IMAGE=alfresco/alfresco-content-repository
+ALFRESCO_IMAGE=quay.io/alfresco/alfresco-content-repository
 ALFRESCO_TAG=6.1.0-EA3
-SHARE_IMAGE=alfresco/alfresco-share
+SHARE_IMAGE=quay.io/alfresco/alfresco-share
 SHARE_TAG=6.0
 POSTGRES_TAG=10.1
 SEARCH_TAG=latest
\ No newline at end of file

From bb596d322558f16cc32a7b9615742029dffb266c Mon Sep 17 00:00:00 2001
From: "meenal.bhave@alfresco.com" <meenal.bhave@alfresco.com>
Date: Tue, 10 Sep 2019 16:05:14 +0100
Subject: [PATCH 4/4] SearchSearch:1835: Added comment for using GS Version
 3.1.0

---
 e2e-test/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index 8bc984e89..41bf7fcd5 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -14,6 +14,8 @@
       <tas.rest.api.version>6.0.1.2</tas.rest.api.version>
       <tas.cmis.api.version>6.0.0.4</tas.cmis.api.version>
       <tas.utility.version>3.0.11</tas.utility.version>
+      <!-- GS V3.1-0 is not compatible with IE, but GS automation Artifacts V3.1-0 have been suggested to be used for GS-IE automation tests 
+      This version needs to be later updated with IE compatible GS version based on Alfresco 6.1.x -->
       <rm.version>3.1.0</rm.version>
       <suiteXmlFile>src/test/resources/SearchSuite.xml</suiteXmlFile>
       <test.exclude></test.exclude>