From dc476422c80800ea327078a7347ff2981d4f544a Mon Sep 17 00:00:00 2001
From: jainakshat2 <akshat.jain@contractors.onbase.com>
Date: Mon, 19 Aug 2024 12:49:12 +0530
Subject: [PATCH 1/2] testing elasticsearch testcases with latest SS alpha
 version

---
 docker-alfresco/pom.xml                                | 8 ++++++++
 pom.xml                                                | 2 +-
 tests/environment/.env                                 | 2 +-
 tests/environment/docker-compose-pipeline-all-amps.yml | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index cd9cb5b780..d482379d0d 100644
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -59,6 +59,14 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/amps</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.alfresco.services.sync</groupId>
+                                    <artifactId>alfresco-device-sync-repo</artifactId>
+                                    <version>${alfresco.desktop-sync.version}</version>
+                                    <type>amp</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 81923ffbf1..a147f667f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <alfresco.azure-connector.version>5.0.2</alfresco.azure-connector.version>
         <alfresco.salesforce-connector.version>3.1.0</alfresco.salesforce-connector.version>
         <alfresco.outlook.version>2.9.0</alfresco.outlook.version>
-        <alfresco.desktop-sync.version>5.0.0-M3</alfresco.desktop-sync.version>
+        <alfresco.desktop-sync.version>5.1.0-A4</alfresco.desktop-sync.version>
         <alfresco.ais.version>3.1.6-A2</alfresco.ais.version>
         <alfresco.hxinsight-connector.version>1.0.0-A7</alfresco.hxinsight-connector.version>
 
diff --git a/tests/environment/.env b/tests/environment/.env
index 1d0d0a5f4a..ba6057075f 100644
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -7,7 +7,7 @@ MSSQL_TAG=2019-CU9-ubuntu-16.04
 ORACLE_TAG=19.3.0-ee
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
 KEYCLOAK_TAG=24.0.3
-SYNC_SERVICE_TAG=5.0.0-M3
+SYNC_SERVICE_TAG=5.1.0-A4
 TRANSFORM_ROUTER_TAG=4.1.4-A2
 TRANSFORM_CORE_AIO_TAG=5.1.4-A3
 SHARED_FILE_STORE_TAG=4.1.4-A2
diff --git a/tests/environment/docker-compose-pipeline-all-amps.yml b/tests/environment/docker-compose-pipeline-all-amps.yml
index 2ee3c33932..56a3aa1db9 100644
--- a/tests/environment/docker-compose-pipeline-all-amps.yml
+++ b/tests/environment/docker-compose-pipeline-all-amps.yml
@@ -180,7 +180,7 @@ services:
             - share
 
     sync-service:
-        image: quay.io/alfresco/service-sync:5.0.0-M3
+        image: quay.io/alfresco/service-sync:5.1.0-A4
         mem_limit: 1g
         environment:
             JAVA_OPTS : "

From 215720bf46b155a9e7c0c03ff7af71c2fdf1bd5f Mon Sep 17 00:00:00 2001
From: jainakshat2 <akshat.jain@contractors.onbase.com>
Date: Wed, 28 Aug 2024 14:59:13 +0530
Subject: [PATCH 2/2] testing commit for elastic search testcases failure with
 SS

---
 .../alfresco-with-jdbc-drivers/es-connector.Dockerfile          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile b/tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile
index 30bc68cd03..71361b25b3 100644
--- a/tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile
+++ b/tests/environment/alfresco-with-jdbc-drivers/es-connector.Dockerfile
@@ -1,5 +1,5 @@
 #BUIDING CONTAINER FOR TAS TESTING WITH DIFFERENT JDBC CONNECTORS
 ARG IMAGE_NAME
-FROM $IMAGE_NAME
+FROM quay.io/alfresco/alfresco-elasticsearch-live-indexing:latest
 
 COPY tests/environment/alfresco-with-jdbc-drivers/*.jar /opt/db-drivers/