From 92c45162a713304fa18e60b05b3e17ac313d9f01 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Thu, 13 Oct 2016 15:29:12 +0300
Subject: [PATCH 01/24] fixed "get pending reviews" solr query

(cherry picked from commit 798b76a8ed1e4f07737edddd3a7b399f478d318f)
---
 .../job/NotifyOfRecordsDueForReviewJobExecuter.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
index 4a7ad4b735..37b8d46324 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
@@ -92,8 +92,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
                 // notification has not been sent.
                 StringBuilder queryBuffer = new StringBuilder();
                 queryBuffer.append("+ASPECT:\"rma:vitalRecord\" ");
-                queryBuffer.append("+(@rma\\:reviewAsOf:[MIN TO NOW] ) ");
-                queryBuffer.append("+( ");
+                queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] ");
+                queryBuffer.append("AND ( ");
                 queryBuffer.append("@rma\\:notificationIssued:false ");
                 queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" ");
                 queryBuffer.append(") ");

From 4b621be61decde1a07366b7c35d6479a9ed395bc Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Mon, 31 Oct 2016 14:31:24 +0200
Subject: [PATCH 02/24] temporary changed installer location to test with
 alfresco 5.1.2

---
 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 dc35b8a092..9477b85324 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/qa/${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 21ebb12959fad719e92a0b4b5265d5f680ffc3b7 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 14:22:08 +0200
Subject: [PATCH 03/24] removed /qa from installer path base

---
 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 9477b85324..948d8ddff0 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/qa/${installer.path}" dest="target/alf-installer.bin" />
+                              <get src="https://bamboo.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 fd232d2d727da80ddb5c1c37ad0fc5c5808840b9 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 14:45:52 +0200
Subject: [PATCH 04/24] added bamboo credentials

---
 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 948d8ddff0..cb5f20d102 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" />
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="${bamboo_auth.ldap.username}" password="${bamboo_auth.ldap.password}"/>
                               <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 c33db37eb660ad5d31af40a06b9033931aeb0616 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 14:50:04 +0200
Subject: [PATCH 05/24] updated bamboo username

---
 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 cb5f20d102..d42c6d26a3 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="${bamboo_auth.ldap.username}" password="${bamboo_auth.ldap.password}"/>
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.ldap.password}"/>
                               <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 a2c37b4be5a3996c8d53378f13d0de100cb3617d Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 14:57:44 +0200
Subject: [PATCH 06/24] updated bamboo_auth password

---
 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 d42c6d26a3..922d1114e1 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.ldap.password}"/>
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo.bamboo_auth.ldap.password}"/>
                               <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 ce93ceb9305fb65fb89e391467521494ea053dde Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 15:03:06 +0200
Subject: [PATCH 07/24] Revert "updated bamboo_auth password"

This reverts commit a2c37b4be5a3996c8d53378f13d0de100cb3617d.
---
 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 922d1114e1..d42c6d26a3 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo.bamboo_auth.ldap.password}"/>
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.ldap.password}"/>
                               <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 15fdde00095e249823d209e430d4e0c609d9c330 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 15:16:17 +0200
Subject: [PATCH 08/24] try placeholder bamboo_auth_ldap_password

---
 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 d42c6d26a3..47cd642445 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.ldap.password}"/>
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth_ldap_password}"/>
                               <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 ff574212d037492881ef35ff355cda259a81d68b Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 15:31:28 +0200
Subject: [PATCH 09/24] Revert "try placeholder bamboo_auth_ldap_password"

This reverts commit 15fdde00095e249823d209e430d4e0c609d9c330.
---
 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 47cd642445..d42c6d26a3 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth_ldap_password}"/>
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.ldap.password}"/>
                               <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 b1cf8bf93e2be69bcbea4218300ce40cff2a3991 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 15:38:36 +0200
Subject: [PATCH 10/24] changed bamboo user password to bamboo_auth.password

---
 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 d42c6d26a3..d013022460 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.ldap.password}"/>
+                              <get src="https://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.password}"/>
                               <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 0e8ba89905e01ca3e96bd6d878fe02cca638fb48 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 1 Nov 2016 17:29:27 +0200
Subject: [PATCH 11/24] get the alfresco installer with scp

---
 rm-automation/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index d013022460..8e00b85d4f 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -194,7 +194,10 @@
                               <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://bamboo.alfresco.com/${installer.path}" dest="target/alf-installer.bin" username="bamboo_auth" password="${bamboo_auth.password}"/>
+
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt /data/bamboo/artifacts/${enterprise.build.plan}/ALL/alfresco-*-linux-x64.??? | tail -1 | tr ' ' '?' "/>
+                              <scp file="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa"/>
+
                               <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 e922bac36d7af96bea65b0d4eec9f457d57acbde Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 10:54:18 +0200
Subject: [PATCH 12/24] get RM amps with scp

---
 rm-automation/pom.xml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 8e00b85d4f..41c45da52b 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -230,22 +230,15 @@
                            <goal>copy</goal>
                         </goals>
                         <configuration>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-enterprise-share</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                              <artifactItem>
-                                 <groupId>org.alfresco</groupId>
-                                 <artifactId>alfresco-rm-enterprise-repo</artifactId>
-                                 <version>${project.version}</version>
-                                 <type>amp</type>
-                              </artifactItem>
-                           </artifactItems>
-                           <outputDirectory>${project.build.directory}/amps</outputDirectory>
-                           <useBaseVersion>true</useBaseVersion>
+                           <target>
+                              <echo>Fetching repo amp...</echo> 
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="repoAmpPath" command="ls -rt /xml-data/build-dir/${amp.build.plan}-EN/rm-enterprise/rm-enterprise-repo/target/alfresco-rm-enterprise-repo-*.amp | tail -1 | tr ' ' '?' "/>
+                              <scp file="tomcat@pbam01.alfresco.com:${repoAmpPath}" localTofile="${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp" keyfile="${user.home}/.ssh/id_rsa"/>
+
+                              <echo>Fetching share amp...</echo> 
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="shareAmpPath" command="ls -rt /xml-data/build-dir/${amp.build.plan}-EN/rm-enterprise/rm-enterprise-share/target/alfresco-rm-enterprise-share-*.amp | tail -1 | tr ' ' '?' "/>
+                              <scp file="tomcat@pbam01.alfresco.com:${shareAmpPath}" localTofile="${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp" keyfile="${user.home}/.ssh/id_rsa"/>
+                           </target>
                         </configuration>
                      </execution>
                   </executions>

From 19f16756b42c1f7cc0777a26ee95bb676ea99496 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 10:59:43 +0200
Subject: [PATCH 13/24] changed fetch-amps goal from copy to run

---
 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 41c45da52b..82c002e3ca 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -227,7 +227,7 @@
                         <id>fetch-amps</id>
                         <phase>process-test-resources</phase>
                         <goals>
-                           <goal>copy</goal>
+                           <goal>run</goal>
                         </goals>
                         <configuration>
                            <target>

From 3494f9b826843fb12c48827a71ad00d54f25a250 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 11:06:18 +0200
Subject: [PATCH 14/24] moved fetch-amps execution to maven-antrun-plugin

---
 rm-automation/pom.xml | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 82c002e3ca..63e2fe5ffa 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -206,24 +206,7 @@
                            </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>
-                        <version>9.1-901-1.jdbc4</version>
-                     </dependency>
-                  </dependencies>
-               </plugin>
-               <plugin>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                     <execution>
+					 <execution>
                         <id>fetch-amps</id>
                         <phase>process-test-resources</phase>
                         <goals>
@@ -242,6 +225,18 @@
                         </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>
+                        <version>9.1-901-1.jdbc4</version>
+                     </dependency>
+                  </dependencies>
                </plugin>
                <plugin>
                   <groupId>org.alfresco.maven.plugin</groupId>

From fb998a4b5fc7ccc89fdb45da0f5703218e67e2dd Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 12:28:19 +0200
Subject: [PATCH 15/24] changed amp artifacts location

---
 rm-automation/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 63e2fe5ffa..9447d1c0fe 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -215,11 +215,11 @@
                         <configuration>
                            <target>
                               <echo>Fetching repo amp...</echo> 
-                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="repoAmpPath" command="ls -rt /xml-data/build-dir/${amp.build.plan}-EN/rm-enterprise/rm-enterprise-repo/target/alfresco-rm-enterprise-repo-*.amp | tail -1 | tr ' ' '?' "/>
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="repoAmpPath" command="ls -rt /data/bamboo/artifacts/${amp.build.plan}/Repo-Enterprise-AMP/alfresco-rm-enterprise-repo-*.amp | tail -1 | tr ' ' '?' "/>
                               <scp file="tomcat@pbam01.alfresco.com:${repoAmpPath}" localTofile="${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp" keyfile="${user.home}/.ssh/id_rsa"/>
 
                               <echo>Fetching share amp...</echo> 
-                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="shareAmpPath" command="ls -rt /xml-data/build-dir/${amp.build.plan}-EN/rm-enterprise/rm-enterprise-share/target/alfresco-rm-enterprise-share-*.amp | tail -1 | tr ' ' '?' "/>
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="shareAmpPath" command="ls -rt /data/bamboo/artifacts/${amp.build.plan}/Share-Enterprise-AMP/alfresco-rm-enterprise-share-*.amp | tail -1 | tr ' ' '?' "/>
                               <scp file="tomcat@pbam01.alfresco.com:${shareAmpPath}" localTofile="${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp" keyfile="${user.home}/.ssh/id_rsa"/>
                            </target>
                         </configuration>

From 09963624d629a6ad74638b31d77461d6006a2e15 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 13:42:49 +0200
Subject: [PATCH 16/24] temporary removed fetch amps

---
 rm-automation/pom.xml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 9447d1c0fe..918c5edccf 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -205,24 +205,6 @@
                               </exec>
                            </target>
                         </configuration>
-                     </execution>
-					 <execution>
-                        <id>fetch-amps</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                        <configuration>
-                           <target>
-                              <echo>Fetching repo amp...</echo> 
-                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="repoAmpPath" command="ls -rt /data/bamboo/artifacts/${amp.build.plan}/Repo-Enterprise-AMP/alfresco-rm-enterprise-repo-*.amp | tail -1 | tr ' ' '?' "/>
-                              <scp file="tomcat@pbam01.alfresco.com:${repoAmpPath}" localTofile="${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp" keyfile="${user.home}/.ssh/id_rsa"/>
-
-                              <echo>Fetching share amp...</echo> 
-                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="shareAmpPath" command="ls -rt /data/bamboo/artifacts/${amp.build.plan}/Share-Enterprise-AMP/alfresco-rm-enterprise-share-*.amp | tail -1 | tr ' ' '?' "/>
-                              <scp file="tomcat@pbam01.alfresco.com:${shareAmpPath}" localTofile="${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp" keyfile="${user.home}/.ssh/id_rsa"/>
-                           </target>
-                        </configuration>
                      </execution>
                   </executions>
                   <dependencies>

From 25264220efbe50103d8ca3c2a8a7d51cce05b316 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 14:31:51 +0200
Subject: [PATCH 17/24] added original fetch amps back

---
 rm-automation/pom.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 918c5edccf..8e00b85d4f 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -220,6 +220,36 @@
                      </dependency>
                   </dependencies>
                </plugin>
+               <plugin>
+                  <artifactId>maven-dependency-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>fetch-amps</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                           <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                           <artifactItems>
+                              <artifactItem>
+                                 <groupId>org.alfresco</groupId>
+                                 <artifactId>alfresco-rm-enterprise-share</artifactId>
+                                 <version>${project.version}</version>
+                                 <type>amp</type>
+                              </artifactItem>
+                              <artifactItem>
+                                 <groupId>org.alfresco</groupId>
+                                 <artifactId>alfresco-rm-enterprise-repo</artifactId>
+                                 <version>${project.version}</version>
+                                 <type>amp</type>
+                              </artifactItem>
+                           </artifactItems>
+                           <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                           <useBaseVersion>true</useBaseVersion>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
                <plugin>
                   <groupId>org.alfresco.maven.plugin</groupId>
                   <artifactId>alfresco-maven-plugin</artifactId>

From 8ce501035b71ac14edc0de9c693e33f4413a69b3 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 15:12:49 +0200
Subject: [PATCH 18/24] updated tag for next development iteration

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

diff --git a/pom.xml b/pom.xml
index 7ec3fcda41..3d88ad777f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
       <connection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</connection>
       <developerConnection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</developerConnection>
       <url>https://gitlab.alfresco.com/records-management/records-management</url>
-      <tag>V2.5.0</tag>
+      <tag>HEAD</tag>
    </scm>
 
    <issueManagement>

From c27ac5cd6a313e326f73b32ecafda3137945397f Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 15:50:21 +0200
Subject: [PATCH 19/24] added classifier to amp atrtifacts

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

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 8e00b85d4f..3d532cf143 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -236,12 +236,14 @@
                                  <artifactId>alfresco-rm-enterprise-share</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
+								 <classifier>amp</classifier>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
                                  <artifactId>alfresco-rm-enterprise-repo</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
+								 <classifier>amp</classifier>
                               </artifactItem>
                            </artifactItems>
                            <outputDirectory>${project.build.directory}/amps</outputDirectory>

From 49d5d9cb88a9f7c9bc45ef1de60cf37e7f788f1e Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 16:21:55 +0200
Subject: [PATCH 20/24] updated scp alfresco installer path

---
 rm-automation/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 3d532cf143..5d4e8ed794 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -195,8 +195,8 @@
                               <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>
 
-                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt /data/bamboo/artifacts/${enterprise.build.plan}/ALL/alfresco-*-linux-x64.??? | tail -1 | tr ' ' '?' "/>
-                              <scp file="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa"/>
+                              <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${installer.path} | tail -1 | tr ' ' '?' " />
+                              <scp remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" />
 
                               <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
                               <echo>Installing Alfresco...</echo>

From 4a542c78a4f767c892a4ff6bc926b4d7c5ca8e2b Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Wed, 2 Nov 2016 16:42:05 +0200
Subject: [PATCH 21/24] Revert "added classifier to amp atrtifacts"

This reverts commit c27ac5cd6a313e326f73b32ecafda3137945397f.
---
 rm-automation/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 5d4e8ed794..fc21cab5bc 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -236,14 +236,12 @@
                                  <artifactId>alfresco-rm-enterprise-share</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
-								 <classifier>amp</classifier>
                               </artifactItem>
                               <artifactItem>
                                  <groupId>org.alfresco</groupId>
                                  <artifactId>alfresco-rm-enterprise-repo</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
-								 <classifier>amp</classifier>
                               </artifactItem>
                            </artifactItems>
                            <outputDirectory>${project.build.directory}/amps</outputDirectory>

From 23a3e9af5d6847d61fdd6e99f4999bb4ccc9df04 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Fri, 14 Oct 2016 18:41:00 +0300
Subject: [PATCH 22/24] RM-4249 - workaround : replaced maxEntries with a
 positive value

(cherry picked from commit 4b76fb838fd24d9c26e7d8d5e58449d71637062e)
---
 .../audit/RecordsManagementAuditQueryParameters.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
index 4cc11842a7..ec77698540 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
@@ -42,7 +42,7 @@ import org.alfresco.service.namespace.QName;
 @AlfrescoPublicApi
 public final class RecordsManagementAuditQueryParameters
 {
-    private int maxEntries = -1;
+    private int maxEntries = Integer.MAX_VALUE;
     private String user;
     private NodeRef nodeRef;
     private Date dateFrom;

From 43287c103593a10fd05a150451fde37a1a9c6628 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Tue, 18 Oct 2016 18:28:29 +0300
Subject: [PATCH 23/24] fixed audit unit tests

(cherry picked from commit 7a33945dffff0d7f29691ead503318daaffea4a4)
---
 .../RecordsManagementAuditServiceImplTest.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
index 50511302a7..4c9f507c19 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
@@ -171,9 +171,9 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
         // "audit.start", "audit.view" and "Update RM Object";
         entries = getAuditTrail(3, ADMIN_USER);
 
-        assertEquals(entries.get(0).getEvent(), "audit.start");
+        assertEquals(entries.get(2).getEvent(), "audit.start");
         assertEquals(entries.get(1).getEvent(), "audit.view");
-        assertEquals(entries.get(2).getEvent(), "Update RM Object");
+        assertEquals(entries.get(0).getEvent(), "Update RM Object");
 
         // New "audit.view" event was generated - will be visible on next getAuditTrail().
 
@@ -185,14 +185,14 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
                 nodeService.deleteNode(record);
                 List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);
 
-                assertEquals(entries.get(0).getEvent(), "audit.start");
-                assertEquals(entries.get(1).getEvent(), "audit.view");
-                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(4).getEvent(), "audit.start");
                 assertEquals(entries.get(3).getEvent(), "audit.view");
+                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(1).getEvent(), "audit.view");
 
                 // Show the audit contains a reference to the deleted item:
-                assertEquals(entries.get(4).getEvent(), "Delete RM Object");
-                assertEquals(entries.get(4).getNodeRef(), record);
+                assertEquals(entries.get(0).getEvent(), "Delete RM Object");
+                assertEquals(entries.get(0).getNodeRef(), record);
 
                 return null;
             }
@@ -212,7 +212,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
 
         // show the audit has been updated
         List<RecordsManagementAuditEntry> entries = getAuditTrail(3, ADMIN_USER);
-        final RecordsManagementAuditEntry entry = entries.get(2);
+        final RecordsManagementAuditEntry entry = entries.get(0);
         assertNotNull(entry);
 
         // investigate the contents of the audit entry

From d457a67cf6c636530e1e191fb61bb899f0abdb46 Mon Sep 17 00:00:00 2001
From: Ana Bozianu <ana.bozianu@ness.com>
Date: Fri, 4 Nov 2016 17:26:32 +0200
Subject: [PATCH 24/24] Revert "updated tag for next development iteration"

This reverts commit 8ce501035b71ac14edc0de9c693e33f4413a69b3.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d88ad777f..7ec3fcda41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
       <connection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</connection>
       <developerConnection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</developerConnection>
       <url>https://gitlab.alfresco.com/records-management/records-management</url>
-      <tag>HEAD</tag>
+      <tag>V2.5.0</tag>
    </scm>
 
    <issueManagement>