From 46fa12486b3a7c3a3b25c4e915507dabadc88efb 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/26] fixed "get pending reviews" solr query

(cherry picked from commit 3f75ea5d1d12f2cc794f9dd6e5c96af06f33501b)
---
 .../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 3c08b3f05be1622956486dd17604ad2a98bec24d 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/26] 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 5ca7bcf3244632d94e72408a953d9364a55579f8 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/26] 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 54951656a04251b8d7e917a23db683a0c2b9ca5d 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/26] 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 8a7cf546892e7888603a755082e6a0d9e019ec2a 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/26] 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 716e145b4cbcc12fb482da04c7bdf8ce5ec88d4b 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/26] 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 a526c032b70ddd360382295b2662308aeaf2a8c0 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/26] Revert "updated bamboo_auth password"

This reverts commit 716e145b4cbcc12fb482da04c7bdf8ce5ec88d4b.
---
 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 01449f05482477e00cb268c884691f68669e6c6c 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/26] 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 c9f80e154b836dba25ee29e0711790d06de016f2 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/26] Revert "try placeholder bamboo_auth_ldap_password"

This reverts commit 01449f05482477e00cb268c884691f68669e6c6c.
---
 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 b8fe7873f514a86f71a413cd82f6e9353b7d6afe 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/26] 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 caf178e1c3c1ac9a7d5613f865fd3be1d766e2d1 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/26] 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 a01b6ed812c4031a9c4a449c9544b3540e5dc2c7 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/26] 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 eb087e36a3ca3238a26a90b07840e93ed35f3e66 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/26] 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 bfe9661aad6e1fdd227665f33e1e48193869e30f 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/26] 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 1220b1c9f65f76004d6a412e3c3545b4cd95c89c 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/26] 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 725f2280f3c31dd3f6bdf51f57104c60c47fc4ee 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/26] 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 a9f32297838be7ced4bc996a90a9a7751be6dc89 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/26] 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 e06900cb65753d6053ff32db5516431d0019b101 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/26] 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 52da6976b03cb0e663a19b4ead68928de7dfc649 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/26] 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 39d4b16ac7b3b385fbb2e17d9eb92024f247894d 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/26] 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 00c7f2a75d54278e92bffbe47f824ed159edf7d3 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/26] Revert "added classifier to amp atrtifacts"

This reverts commit 52da6976b03cb0e663a19b4ead68928de7dfc649.
---
 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 ab85906adc7d5978226bf6c67dcf167307aa7b4f 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/26] RM-4249 - workaround : replaced maxEntries with a
 positive value

(cherry picked from commit 995448081e3b9b54e9fdfaf6087e3d2ef371a65c)
---
 .../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 55e15e1dca06a446bedc058712381c5f6f160fb9 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/26] fixed audit unit tests

(cherry picked from commit e686da88de04f14b7ef2a63594df7424982e8cbc)
---
 .../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 d7e35f1a5f9696cccdcd75f61ace6b1b53a91f3e 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/26] Revert "updated tag for next development iteration"

This reverts commit e06900cb65753d6053ff32db5516431d0019b101.
---
 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>

From 2d8bc8f59611b43554900cb29e0cc21b5e7d1807 Mon Sep 17 00:00:00 2001
From: alfresco-build <info@alfresco.com>
Date: Mon, 7 Nov 2016 12:45:59 +0000
Subject: [PATCH 25/26] [maven-release-plugin] prepare release V2.5.0.1

---
 pom.xml                                | 4 ++--
 rm-automation/pom.xml                  | 2 +-
 rm-community/pom.xml                   | 2 +-
 rm-community/rm-community-repo/pom.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ec3fcda41..5604f2b284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm</artifactId>
    <packaging>pom</packaging>
-   <version>2.5.0.1-SNAPSHOT</version>
+   <version>2.5.0.1</version>
    <name>Alfresco Records Management</name>
 
    <parent>
@@ -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>V2.5.0.1</tag>
    </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index fc21cab5bc..c65dd7f52f 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.0.1-SNAPSHOT</version>
+      <version>2.5.0.1</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index 305e5c2765..cbb653979a 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.0.1-SNAPSHOT</version>
+      <version>2.5.0.1</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 5bc7efd8f5..5e0e1757bb 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-community</artifactId>
-      <version>2.5.0.1-SNAPSHOT</version>
+      <version>2.5.0.1</version>
    </parent>
 
    <properties>

From c6541e6d2f2041e1117f550dd0a948ebb38c6231 Mon Sep 17 00:00:00 2001
From: alfresco-build <info@alfresco.com>
Date: Mon, 7 Nov 2016 12:46:02 +0000
Subject: [PATCH 26/26] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml                                | 4 ++--
 rm-automation/pom.xml                  | 2 +-
 rm-community/pom.xml                   | 2 +-
 rm-community/rm-community-repo/pom.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5604f2b284..2de2a93ed7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm</artifactId>
    <packaging>pom</packaging>
-   <version>2.5.0.1</version>
+   <version>2.5.0.2-SNAPSHOT</version>
    <name>Alfresco Records Management</name>
 
    <parent>
@@ -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.1</tag>
+      <tag>V2.5.0</tag>
    </scm>
 
    <issueManagement>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index c65dd7f52f..8f8ce1a3c8 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.0.1</version>
+      <version>2.5.0.2-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/rm-community/pom.xml b/rm-community/pom.xml
index cbb653979a..c7e2c8efbf 100644
--- a/rm-community/pom.xml
+++ b/rm-community/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm</artifactId>
-      <version>2.5.0.1</version>
+      <version>2.5.0.2-SNAPSHOT</version>
    </parent>
 
    <licenses>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 5e0e1757bb..634eebcd11 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -9,7 +9,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-community</artifactId>
-      <version>2.5.0.1</version>
+      <version>2.5.0.2-SNAPSHOT</version>
    </parent>
 
    <properties>