From 0ceba1359b3528d0040f15e21a8755c9bcabfbce Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Dec 2016 13:45:52 +0000
Subject: [PATCH 1/5] MNT-17241 (Access denied exception thrown during preview
 of certain content by non-admin/non-site member users)

---
 .../model/rma/aspect/FilePlanComponentAspect.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
index a2cbdb696c..5a9b7f0ce4 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
@@ -211,6 +211,19 @@ public class FilePlanComponentAspect extends    BaseBehaviourBean
                     {
                         nodeService.setProperty(nodeRef, PROP_ROOT_NODEREF, root);
                     }
+
+                    // If the node has any renditions, they inherit the file plan from their source node.
+                    List<ChildAssociationRef> renditions = renditionService.getRenditions(nodeRef);
+                    NodeRef rendition;
+                    for (ChildAssociationRef chAssRef : renditions)
+                    {
+                        rendition = chAssRef.getChildRef();
+                        if (nodeService.exists(rendition))
+                        {
+                            // Apply file plan component aspect to node's renditions
+                            nodeService.addAspect(rendition, ASPECT_FILE_PLAN_COMPONENT, null);
+                        }
+                    }
                 }
 
                 return null;

From 70776d52400027fcd39f368d92388b1361cae0a6 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Dec 2016 18:45:17 +0000
Subject: [PATCH 2/5] Added a check to see if the aspect hasn't been removed in
 the same transaction.

---
 .../model/rma/aspect/FilePlanComponentAspect.java              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
index 5a9b7f0ce4..93d241389b 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
@@ -203,7 +203,8 @@ public class FilePlanComponentAspect extends    BaseBehaviourBean
             @Override
             public Void doWork()
             {
-                if (nodeService.exists(nodeRef))
+                // Check if the node exists and the aspect hasn't been removed in the same transaction (see RM-3266)
+                if (nodeService.exists(nodeRef) && nodeService.hasAspect(nodeRef, aspectTypeQName))
                 {
                     // Look up the root and set on the aspect if found
                     NodeRef root = filePlanService.getFilePlan(nodeRef);

From 86ad1304c26ab095b011ae264803c85989cbeb5a Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Dec 2016 20:41:11 +0000
Subject: [PATCH 3/5] Set renditionService property for filePlanComponent bean
 definition

---
 .../alfresco/module/org_alfresco_module_rm/rm-model-context.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
index 0d6a6f6119..b19c9647fa 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
@@ -103,6 +103,7 @@
         <property name="scriptService" ref="ScriptService" />
         <property name="namespaceService" ref="NamespaceService" />
         <property name="filePlanService" ref="FilePlanService" />
+        <property name="renditionService" ref="RenditionService" />
    </bean>
 
    <bean id="rma.record" class="org.alfresco.module.org_alfresco_module_rm.model.rma.aspect.RecordAspect" parent="rm.baseBehaviour">

From 4e239abd1a7a8f3c9de42340e42dc52fef121bdc Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Dec 2016 21:24:29 +0000
Subject: [PATCH 4/5] Fixed Alfresco installer download config

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

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 60843ec89e..f2360ce503 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -152,8 +152,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>
-                                        <sshexec username="tomcat" host="pbld01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${enterprise.installer.path} | tail -1 | tr ' ' '?' " />
-                                        <scp remoteFile="tomcat@pbld01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" />
+                                        <get src="https://releases.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 dc3ecec202c24ecfb02197339de20c2b1be0ed4c Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 20 Dec 2016 11:04:18 +0000
Subject: [PATCH 5/5] Copied the ui-automation code from release/v2.3

---
 rm-automation/pom.xml | 651 +++++++++++++++++++++++-------------------
 1 file changed, 351 insertions(+), 300 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index f2360ce503..c854ebf442 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -1,311 +1,362 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>alfresco-rm-parent</artifactId>
-        <version>2.3.0.9-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-rm-automation</artifactId>
-    <properties>
-        <selenium.version>2.43.1</selenium.version>
-        <spring.version>4.0.5.RELEASE</spring.version>
-    </properties>
-    <build>
-        <plugins>
-            <!-- Additional source folder to be added: source/compatibility -->
+
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>alfresco-rm-automation</artifactId>
+   <name>Alfresco Records Management Automation</name>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-rm-parent</artifactId>
+      <version>2.3.0.9-SNAPSHOT</version>
+   </parent>
+
+   <properties>
+      <selenium.version>2.45.0</selenium.version>
+      <spring.version>4.0.5.RELEASE</spring.version>
+      <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
+      <suiteXmlFile>testng.xml</suiteXmlFile>
+      <skip.automationtests>true</skip.automationtests>
+   </properties>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>add-test-source</id>
+                  <goals>
+                     <goal>add-test-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>src/unit-test/java</source>
+                     </sources>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <redirectTestOutputToFile>false</redirectTestOutputToFile>
+               <suiteXmlFiles>
+                  <suiteXmlFile>${project.build.testOutputDirectory}/${suiteXmlFile}</suiteXmlFile>
+               </suiteXmlFiles>
+               <skipTests>${skip.automationtests}</skipTests>
+            </configuration>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>default-cli</id>
+                  <configuration>
+                     <target>
+                        <echo>Stopping Alfresco...</echo>
+                        <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
+                           <arg value="stop" />
+                        </exec>
+                     </target>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>license-maven-plugin</artifactId>
+            <configuration>
+               <licenseName>alfresco_enterprise</licenseName>
+               <licenseResolver>file:${project.parent.basedir}/license</licenseResolver>
+               <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
+            </configuration>
+         </plugin>
+      </plugins>
+      <pluginManagement>
+         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-test-source</id>
+               <groupId>org.eclipse.m2e</groupId>
+               <artifactId>lifecycle-mapping</artifactId>
+               <version>1.0.0</version>
+               <configuration>
+                  <lifecycleMappingMetadata>
+                     <pluginExecutions>
+                        <pluginExecution>
+                           <pluginExecutionFilter>
+                              <groupId>org.codehaus.mojo</groupId>
+                              <artifactId>license-maven-plugin</artifactId>
+                              <versionRange>[1.8,)</versionRange>
+                              <goals>
+                                 <goal>update-file-header</goal>
+                              </goals>
+                           </pluginExecutionFilter>
+                           <action>
+                              <ignore />
+                           </action>
+                        </pluginExecution>
+                     </pluginExecutions>
+                  </lifecycleMappingMetadata>
+               </configuration>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.alfresco.test</groupId>
+         <artifactId>dataprep</artifactId>
+         <version>1.8</version>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco.test</groupId>
+         <artifactId>alfresco-testng</artifactId>
+         <version>1.1</version>
+      </dependency>
+      <dependency>
+         <groupId>org.alfresco</groupId>
+         <artifactId>selenium-grid</artifactId>
+         <version>1.8</version>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-beans</artifactId>
+         <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-core</artifactId>
+         <version>${spring.version}</version>
+         </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-context</artifactId>
+         <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-tx</artifactId>
+         <version>${spring.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-test</artifactId>
+         <version>${spring.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <version>6.8.8</version>
+      </dependency>
+      <dependency>
+         <groupId>ru.yandex.qatools.htmlelements</groupId>
+         <artifactId>htmlelements-all</artifactId>
+         <version>1.15</version>
+      </dependency>
+      <dependency>
+         <groupId>ru.yandex.qatools.properties</groupId>
+         <artifactId>properties-loader</artifactId>
+         <version>1.5</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>com.github.tomakehurst</groupId>
+         <artifactId>wiremock</artifactId>
+         <version>1.56</version>
+      </dependency>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-all</artifactId>
+         <version>1.9.5</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-log4j12</artifactId>
+         <version>1.7.22</version>
+         <scope>test</scope>
+     </dependency>
+     <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>jul-to-slf4j</artifactId>
+         <version>1.7.21</version>
+         <scope>test</scope>
+     </dependency>
+   </dependencies>
+
+   <profiles>
+      <profile>
+         <id>install-alfresco</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-antrun-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>fetch-installer</id>
+                        <phase>generate-test-resources</phase>
                         <goals>
-                            <goal>add-test-source</goal>
+                           <goal>run</goal>
                         </goals>
                         <configuration>
-                            <sources>
-                                <source>src/unit-test/java</source>
-                            </sources>
+                           <target>
+                              <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" />
+                              <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>
+                           </target>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <redirectTestOutputToFile>false</redirectTestOutputToFile>
-                    <properties>
-                        <property>
-                            <name>usedefaultlisteners</name>
-                            <value>false</value>
-                        </property>
-                        <property>
-                            <name>listener</name>
-                            <value>org.uncommons.reportng.HTMLReporter, org.uncommons.reportng.JUnitXMLReporter</value>
-                        </property>
-                    </properties>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- Configuration triggered by mvn antrun:run, used by Bamboo to stop server -->
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-cli</id>
+                     </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>
+                        <id>fetch-amps</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                           <goal>copy</goal>
+                        </goals>
                         <configuration>
-                            <target>
-                                <echo>Stopping Alfresco...</echo>
-                                <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
-                                    <arg value="stop" />
-                                </exec>
-                            </target>
+                           <artifactItems>
+                              <artifactItem>
+                                 <groupId>org.alfresco</groupId>
+                                 <artifactId>alfresco-rm-share</artifactId>
+                                 <version>${project.version}</version>
+                                 <type>amp</type>
+                         <classifier>amp</classifier>
+                              </artifactItem>
+                              <artifactItem>
+                                 <groupId>org.alfresco</groupId>
+                                 <artifactId>alfresco-rm-server</artifactId>
+                                 <version>${project.version}</version>
+                                 <type>amp</type>
+                         <classifier>amp</classifier>
+                              </artifactItem>
+                           </artifactItems>
+                           <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                           <useBaseVersion>true</useBaseVersion>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>webdrone</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>${selenium.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-server</artifactId>
-            <version>${selenium.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>6.8.8</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.uncommons</groupId>
-            <artifactId>reportng</artifactId>
-            <version>1.1.4</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ru.yandex.qatools.htmlelements</groupId>
-            <artifactId>htmlelements-all</artifactId>
-            <version>1.12</version>
-        </dependency>
-        <dependency>
-            <groupId>ru.yandex.qatools.properties</groupId>
-            <artifactId>properties-loader</artifactId>
-            <version>1.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>install-alfresco</id>
-            <build>
-                <plugins>
-                    <!-- Download and install the latest enterprise alfresco installer -->
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>fetch-installer</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <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" />
-                                        <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>
-                                    </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>
-                                <id>fetch-amps</id>
-                                <phase>process-test-resources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.alfresco</groupId>
-                                            <artifactId>alfresco-rm-share</artifactId>
-                                            <version>${project.version}</version>
-                                            <classifier>amp</classifier>
-                                            <type>amp</type>
-                                        </artifactItem>
-                                        <artifactItem>
-                                            <groupId>org.alfresco</groupId>
-                                            <artifactId>alfresco-rm-server</artifactId>
-                                            <version>${project.version}</version>
-                                            <classifier>amp</classifier>
-                                            <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>
-                        <extensions>true</extensions>
-                        <executions>
-                            <execution>
-                                <id>install-server-amp</id>
-                                <goals>
-                                    <goal>install</goal>
-                                </goals>
-                                <phase>process-test-resources</phase>
-                                <configuration>
-                                    <backup>true</backup>
-                                    <ampLocation>${project.build.directory}/amps/alfresco-rm-server-${project.version}-amp.amp</ampLocation>
-                                    <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
-                                    <classifier>amp</classifier>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-share-amp</id>
-                                <goals>
-                                    <goal>install</goal>
-                                </goals>
-                                <phase>process-test-resources</phase>
-                                <configuration>
-                                    <backup>true</backup>
-                                    <ampLocation>${project.build.directory}/amps/alfresco-rm-share-${project.version}-amp.amp</ampLocation>
-                                    <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
-                                    <classifier>amp</classifier>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>run-alfresco</id>
-            <build>
-                <plugins>
-                    <!-- Fetch JaCoCo agent and set the argLine property accordingly -->
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.6.3.201306030806</version>
-                        <executions>
-                            <execution>
-                                <id>prepare-jacoco</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.alfresco.maven.plugin</groupId>
+                  <artifactId>alfresco-maven-plugin</artifactId>
+                  <extensions>true</extensions>
+                  <executions>
+                     <execution>
+                        <id>install-server-amp</id>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
                         <configuration>
-                            <includes>
-                                <include>org.alfresco.*</include>
-                            </includes>
+                           <backup>true</backup>
+                           <ampLocation>${project.build.directory}/amps/alfresco-rm-server-${project.version}-amp.amp</ampLocation>
+                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
                         </configuration>
-                    </plugin>
-                    <!-- Starts/stop the installed Alfresco -->
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>start-alfresco</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <echo>Starting Alfresco...</echo>
-                                        <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
-                                            <arg value="start" />
-                                            <env key="CATALINA_OPTS" value="${argLine}" />
-                                        </exec>
-                                        <sleep minutes="5" />
-                                    </target>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>stop-alfresco</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <echo>Stopping Alfresco...</echo>
-                                        <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
-                                            <arg value="stop" />
-                                        </exec>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
+                     </execution>
+                     <execution>
+                        <id>install-share-amp</id>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                           <backup>true</backup>
+                           <ampLocation>${project.build.directory}/amps/alfresco-rm-share-${project.version}-amp.amp</ampLocation>
+                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
+         <id>run-alfresco</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.jacoco</groupId>
+                  <artifactId>jacoco-maven-plugin</artifactId>
+                  <version>0.7.5.201505241946</version>
+                  <executions>
+                     <execution>
+                        <id>prepare-jacoco</id>
+                        <goals>
+                           <goal>prepare-agent</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+                  <configuration>
+                     <includes>
+                        <include>org.alfresco.*</include>
+                     </includes>
+                  </configuration>
+               </plugin>
+               <plugin>
+                  <artifactId>maven-antrun-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>start-alfresco</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                           <goal>run</goal>
+                        </goals>
+                        <configuration>
+                           <target>
+                              <echo>Starting Alfresco...</echo>
+                              <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
+                                 <arg value="start" />
+                                 <env key="CATALINA_OPTS" value="${argLine}" />
+                              </exec>
+                              <sleep minutes="5" />
+                           </target>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>stop-alfresco</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                           <goal>run</goal>
+                        </goals>
+                        <configuration>
+                           <target>
+                              <echo>Stopping Alfresco...</echo>
+                              <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
+                                 <arg value="stop" />
+                              </exec>
+                           </target>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+</project>