From 62937633ea4704cb8921a10df3ab4e01b07ae3cc Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Mon, 5 Dec 2016 18:03:16 +0000
Subject: [PATCH] BDE-837 Allow to specify URL of Alfresco installer in
 functional tests

---
 pom.xml               | 5 +++++
 rm-automation/pom.xml | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c0df8bad0e..dd755c17d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,6 +296,11 @@
                <artifactId>maven-failsafe-plugin</artifactId>
                <version>2.19</version>
             </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-antrun-plugin</artifactId>
+               <version>1.8</version>
+            </plugin>
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 78c62c3a3b..1e6d3439db 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -24,7 +24,6 @@
    </modules>
 
    <properties>
-      <alfresco.installer.host>releases</alfresco.installer.host>
       <maven.compiler.source>1.8</maven.compiler.source>
       <maven.compiler.target>1.8</maven.compiler.target>
       <suiteXmlFile>testng.xml</suiteXmlFile>
@@ -109,22 +108,18 @@
                               <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://${alfresco.installer.host}.alfresco.com/${installer.path}" dest="target/alf-installer.bin" />
+                              <get src="${installer.url}" 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">
                                  <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
                               </exec>
+                              <delete file="target/alf-installer.bin" verbose="true" />
                            </target>
                         </configuration>
                      </execution>
                   </executions>
                   <dependencies>
-                     <dependency>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant-jsch</artifactId>
-                        <version>1.8.2</version>
-                     </dependency>
                      <dependency>
                         <groupId>postgresql</groupId>
                         <artifactId>postgresql</artifactId>