diff --git a/pom.xml b/pom.xml
index 9050fbf956..b6f6c278be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,18 @@
+
+
+
+ ${alfresco.groupId}
+ alfresco-platform-distribution
+ ${alfresco.version}
+ pom
+ import
+
+
+
+
rm-server
rm-share
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 84cc36ef4d..72c3776526 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -1,312 +1,317 @@
-
-
- org.alfresco
- alfresco-rm-parent
- 2.4-SNAPSHOT
-
- 4.0.0
- alfresco-rm-automation
-
- 2.45.0
- 4.0.5.RELEASE
-
- 1.8
-
-
-
-
- ${alfresco.groupId}
- alfresco-platform-distribution
- ${alfresco.version}
- pom
- import
-
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
-
-
- add-test-source
+
+
+ org.alfresco
+ alfresco-rm-parent
+ 2.4-SNAPSHOT
+
+ 4.0.0
+ alfresco-rm-automation
+
+ 2.45.0
+ 4.0.5.RELEASE
+
+ 1.8
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ add-test-source
+
+ add-test-source
+
+
+
+ src/unit-test/java
+
+
+
+
+
+
+ maven-surefire-plugin
+
+ false
+
+ ${project.build.testOutputDirectory}/testng.xml
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ default-cli
+
+
+ Stopping Alfresco...
+
+
+
+
+
+
+
+
+
+
+
+
+ org.alfresco.test
+ dataprep
+ 1.4
+
+
+ org.alfresco.test
+ alfresco-testng
+ 1.1
+
+
+ org.alfresco
+ selenium-grid
+ 1.4
+
+
+ org.springframework
+ spring-beans
+ ${spring.version}
+
+
+ org.springframework
+ spring-context
+ ${spring.version}
+
+
+ org.springframework
+ spring-tx
+ ${spring.version}
+ test
+
+
+ org.springframework
+ spring-test
+ ${spring.version}
+ test
+
+
+ org.testng
+ testng
+ 6.8.8
+
+
+ ru.yandex.qatools.htmlelements
+ htmlelements-all
+ 1.12
+
+
+ ru.yandex.qatools.properties
+ properties-loader
+ 1.5
+ test
+
+
+ com.github.tomakehurst
+ wiremock
+ 1.56
+
+
+ org.apache.chemistry.opencmis
+ chemistry-opencmis-client-bindings
+ 0.11.0
+
+
+ org.apache.chemistry.opencmis
+ chemistry-opencmis-client-api
+ 0.11.0
+
+
+ org.apache.chemistry.opencmis
+ chemistry-opencmis-client-impl
+ 0.11.0
+
+
+
+
+ install-alfresco
+
+
+
+
+ maven-antrun-plugin
+
+
+ fetch-installer
+ generate-test-resources
- add-test-source
+ run
-
- src/unit-test/java
-
+
+ Recreating database...
+ drop database if exists alfresco; create database alfresco
+ Downloading Alfresco installer...
+
+
+
+ Installing Alfresco...
+
+
+
+
-
-
-
-
- maven-surefire-plugin
-
- false
-
- ${project.build.testOutputDirectory}/testng.xml
-
-
-
-
-
- maven-antrun-plugin
-
-
- default-cli
+
+
+
+
+ org.apache.ant
+ ant-jsch
+ 1.8.2
+
+
+ postgresql
+ postgresql
+ 9.1-901-1.jdbc4
+
+
+
+
+ maven-dependency-plugin
+
+
+ fetch-amps
+ process-test-resources
+
+ copy
+
-
- Stopping Alfresco...
-
-
-
-
+
+
+ org.alfresco
+ alfresco-rm-share
+ ${project.version}
+ amp
+ amp
+
+
+ org.alfresco
+ alfresco-rm-server
+ ${project.version}
+ amp
+ amp
+
+
+ ${project.build.directory}/amps
+ true
-
-
-
-
-
-
-
- org.alfresco.test
- dataprep
- 1.4
-
-
- org.alfresco.test
- alfresco-testng
- 1.1
-
-
- org.alfresco
- selenium-grid
- 1.4
-
-
- org.springframework
- spring-beans
- ${spring.version}
-
-
- org.springframework
- spring-context
- ${spring.version}
-
-
- org.springframework
- spring-tx
- ${spring.version}
- test
-
-
- org.springframework
- spring-test
- ${spring.version}
- test
-
-
- org.testng
- testng
- 6.8.8
-
-
- ru.yandex.qatools.htmlelements
- htmlelements-all
- 1.12
-
-
- ru.yandex.qatools.properties
- properties-loader
- 1.5
- test
-
-
- com.github.tomakehurst
- wiremock
- 1.56
-
-
-
-
- install-alfresco
-
-
-
-
- maven-antrun-plugin
-
-
- fetch-installer
- generate-test-resources
-
- run
-
-
-
- Recreating database...
- drop database if exists alfresco; create database alfresco
- Downloading Alfresco installer...
-
-
-
- Installing Alfresco...
-
-
-
-
-
-
-
-
-
- org.apache.ant
- ant-jsch
- 1.8.2
-
-
- postgresql
- postgresql
- 9.1-901-1.jdbc4
-
-
-
-
- maven-dependency-plugin
-
-
- fetch-amps
- process-test-resources
-
- copy
-
-
-
-
- org.alfresco
- alfresco-rm-share
- ${project.version}
- amp
- amp
-
-
- org.alfresco
- alfresco-rm-server
- ${project.version}
- amp
- amp
-
-
- ${project.build.directory}/amps
- true
-
-
-
-
-
- org.alfresco.maven.plugin
- alfresco-maven-plugin
- true
-
-
- install-server-amp
-
- install
-
- process-test-resources
-
- true
- ${project.build.directory}/amps/alfresco-rm-server-${project.version}-amp.amp
- ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
- amp
-
-
-
- install-share-amp
-
- install
-
- process-test-resources
-
- true
- ${project.build.directory}/amps/alfresco-rm-share-${project.version}-amp.amp
- ${project.build.directory}/alf-installation/tomcat/webapps/share.war
- amp
-
-
-
-
-
-
-
-
- run-alfresco
-
-
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.6.3.201306030806
-
-
- prepare-jacoco
-
- prepare-agent
-
-
-
+
+
+
+
+ org.alfresco.maven.plugin
+ alfresco-maven-plugin
+ true
+
+
+ install-server-amp
+
+ install
+
+ process-test-resources
-
- org.alfresco.*
-
+ true
+ ${project.build.directory}/amps/alfresco-rm-server-${project.version}-amp.amp
+ ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war
+ amp
-
-
-
- maven-antrun-plugin
-
-
- start-alfresco
- process-test-classes
-
- run
-
-
-
- Starting Alfresco...
-
-
-
-
-
-
-
-
-
- stop-alfresco
- post-integration-test
-
- run
-
-
-
- Stopping Alfresco...
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ install-share-amp
+
+ install
+
+ process-test-resources
+
+ true
+ ${project.build.directory}/amps/alfresco-rm-share-${project.version}-amp.amp
+ ${project.build.directory}/alf-installation/tomcat/webapps/share.war
+ amp
+
+
+
+
+
+
+
+
+ run-alfresco
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.6.3.201306030806
+
+
+ prepare-jacoco
+
+ prepare-agent
+
+
+
+
+
+ org.alfresco.*
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ start-alfresco
+ process-test-classes
+
+ run
+
+
+
+ Starting Alfresco...
+
+
+
+
+
+
+
+
+
+ stop-alfresco
+ post-integration-test
+
+ run
+
+
+
+ Stopping Alfresco...
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index 182297b26c..476c419d4b 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -19,17 +19,6 @@
alfresco
${webapp.id.name}
-
-
-
- ${alfresco.groupId}
- alfresco-platform-distribution
- ${alfresco.version}
- pom
- import
-
-
-
source/java
test/java