From b0fb8b8d674aef072a88435e67cbce2a09226158 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Sun, 13 Nov 2016 21:52:33 +0000
Subject: [PATCH 1/3] Fixed Alfresco installer host

(cherry picked from commit 3070866e2c756b3b70167567c5114513259eac5e)
---
 rm-automation/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 3f1d1b4673..3415a106fc 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -19,6 +19,10 @@
       <skip.automationtests>true</skip.automationtests>
    </properties>
 
+   <properties>
+      <alfresco.installer.host>nightlybuilds</alfresco.installer.host>
+   </properties>
+
    <build>
       <plugins>
          <plugin>
@@ -205,7 +209,7 @@
                               <echo>Recreating database...</echo>
                               <sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql>
                               <echo>Downloading Alfresco installer...</echo>
-                              <get src="https://releases.alfresco.com/${installer.path}" dest="target/alf-installer.bin" />
+                              <get src="https://${alfresco.installer.host}.alfresco.com/${installer.path}" dest="target/alf-installer.bin" />
                               <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
                               <echo>Installing Alfresco...</echo>
                               <exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true">

From d55deb69477a517455b8d66aec93d93456f2d087 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Tue, 22 Nov 2016 10:41:51 +0000
Subject: [PATCH 2/3] For the V2.5 builds we want to default to the released
 artifacts.

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

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 3415a106fc..cb46bc607d 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -20,7 +20,7 @@
    </properties>
 
    <properties>
-      <alfresco.installer.host>nightlybuilds</alfresco.installer.host>
+      <alfresco.installer.host>releases</alfresco.installer.host>
    </properties>
 
    <build>

From c07bb9e75fde2b99447c7072ecfee76ace531c87 Mon Sep 17 00:00:00 2001
From: Tom Page <tom.page@alfresco.com>
Date: Tue, 22 Nov 2016 14:08:47 +0000
Subject: [PATCH 3/3] RM-4456 Fix cherry-picked properties.

We only want one properties entry in the pom file.
---
 rm-automation/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index cb46bc607d..4edfe58243 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -17,9 +17,6 @@
       <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
       <suiteXmlFile>testng.xml</suiteXmlFile>
       <skip.automationtests>true</skip.automationtests>
-   </properties>
-
-   <properties>
       <alfresco.installer.host>releases</alfresco.installer.host>
    </properties>