diff --git a/l10n.properties b/l10n.properties
index 85886b3ad2..c079b739f2 100644
--- a/l10n.properties
+++ b/l10n.properties
@@ -1,4 +1,4 @@
 # Localisation config overrides for Records Management module
-MESSAGE_SEARCH_PATH="rm-community/rm-server/config rm-community/rm-share/config rm-community/rm-share/source rm-enterprise/rm-server-enterprise/src/main/resources rm-enterprise/rm-share-enterprise/src/main"
+MESSAGE_SEARCH_PATH="rm-community/rm-community-repo/config rm-community/rm-community-share rm-community/rm-share/source rm-enterprise/rm-enterprise-repo/src/main/resources rm-enterprise/rm-enterprise-share/src/main "
 EXCLUDED_FILES="$EXCLUDED_FILES rm-method-security.properties springloaded.properties file-mapping.properties classified-content-notForTranslating.properties"
 EXTENSION_PREFIX=-RM
diff --git a/pom.xml b/pom.xml
index 50f48d26b3..ba6897da96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
          <url>https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA</url>
       </repository>
    </repositories>
+
    <pluginRepositories>
       <pluginRepository>
          <id>alfresco-public</id>
@@ -82,6 +83,7 @@
    <modules>
       <module>rm-community</module>
       <module>rm-enterprise</module>
+      <module>rm-automation</module>
    </modules>
 
    <properties>
@@ -100,7 +102,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>
-            <version>1.3.1</version>
             <executions>
                <execution>
                   <id>enforce-java</id>
@@ -120,8 +121,31 @@
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>build-helper-maven-plugin</artifactId>
-            <version>${maven.buildhelper.version}</version>
             <executions>
+               <execution>
+                  <id>regex-properties</id>
+                  <goals>
+                     <goal>regex-properties</goal>
+                  </goals>
+                  <configuration>
+                     <regexPropertySettings>
+                        <regexPropertySetting>
+                           <name>rm.module.repo.version.min</name>
+                           <value>${alfresco.version}</value>
+                           <regex>(\d+)\.(\d+).*</regex>
+                           <replacement>$1.$2</replacement>
+                           <failIfNoMatch>false</failIfNoMatch>
+                        </regexPropertySetting>
+                        <regexPropertySetting>
+                           <name>rm.module.version</name>
+                           <value>${alfresco.rm.version}</value>
+                           <regex>(\d+)\.(\d+).*</regex>
+                           <replacement>$1.$2</replacement>
+                           <failIfNoMatch>false</failIfNoMatch>
+                        </regexPropertySetting>
+                     </regexPropertySettings>
+                  </configuration>
+               </execution>
                <execution>
                   <id>add-test-source</id>
                   <goals>
@@ -149,7 +173,7 @@
          <plugins>
             <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
-               <version>3.2</version>
+               <version>${maven.compiler.version}</version>
                <configuration>
                   <source>${maven.build.sourceVersion}</source>
                   <target>${maven.build.sourceVersion}</target>
@@ -192,6 +216,36 @@
                   </lifecycleMappingMetadata>
                </configuration>
             </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-enforcer-plugin</artifactId>
+               <version>${maven.enforcer.plugin}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>properties-maven-plugin</artifactId>
+               <version>1.0-alpha-2</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-failsafe-plugin</artifactId>
+               <version>2.19</version>
+            </plugin>
+            <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-source-plugin</artifactId>
+               <version>2.4</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>build-helper-maven-plugin</artifactId>
+               <version>${maven.buildhelper.version}</version>
+            </plugin>
+            <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>sql-maven-plugin</artifactId>
+               <version>1.5</version>
+            </plugin>
          </plugins>
       </pluginManagement>
    </build>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
new file mode 100644
index 0000000000..48dccede8f
--- /dev/null
+++ b/rm-automation/pom.xml
@@ -0,0 +1,348 @@
+<?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">
+
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>alfresco-rm-automation</artifactId>
+   <name>Alfresco Records Management Automation</name>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-rm</artifactId>
+      <version>2.5-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>
+      </plugins>
+   </build>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.alfresco.test</groupId>
+         <artifactId>dataprep</artifactId>
+         <version>1.4</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.4</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.12</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.apache.chemistry.opencmis</groupId>
+         <artifactId>chemistry-opencmis-client-bindings</artifactId>
+         <version>0.11.0</version>
+      </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>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>
+                              <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>
+                              <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-community-share</artifactId>
+                                 <version>${project.version}</version>
+                                 <type>amp</type>
+                              </artifactItem>
+                              <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-community-repo</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>
+                  <extensions>true</extensions>
+                  <executions>
+                     <execution>
+                        <id>install-community-repo-amp</id>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                           <backup>true</backup>
+                           <ampLocation>${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp</ampLocation>
+                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>install-enterprise-repo-amp</id>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                           <backup>true</backup>
+                           <ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp</ampLocation>
+                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>install-community-share-amp</id>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                           <backup>true</backup>
+                           <ampLocation>${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp</ampLocation>
+                           <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>install-enterprise-share-amp</id>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                        <configuration>
+                           <backup>true</backup>
+                           <ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.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>
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
index 19d6ed89dd..0d8ed72b10 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module.properties
@@ -6,6 +6,6 @@ module.aliases=org_alfresco_module_dod5015
 
 module.title=Records Management
 module.description=Alfresco Record Management Extension
-module.version=2.3
+module.version=${rm.module.version}
 
-module.repo.version.min=4.2.2
\ No newline at end of file
+module.repo.version.min=${rm.module.repo.version.min}
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 560c76574f..36cb31fc9d 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -26,12 +26,14 @@
       <skip.integrationtests>true</skip.integrationtests>
       <alfresco.solr.home>${project.build.directory}/solr/home</alfresco.solr.home>
    </properties>
+
    <build>
       <sourceDirectory>source/java</sourceDirectory>
       <testSourceDirectory>test/java</testSourceDirectory>
       <resources>
          <resource>
             <directory>config</directory>
+            <filtering>${app.filtering.enabled}</filtering>
          </resource>
       </resources>
       <testResources>
@@ -80,13 +82,13 @@
                      <goal>run</goal>
                   </goals>
                   <configuration>
-                     <tasks>
+                     <target>
                         <copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
                            <fileset dir="${project.build.outputDirectory}/alfresco"/>
                         </copy>
                         <move file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties"
                            todir="${project.build.directory}/${project.build.finalName}"/>
-                     </tasks>
+                     </target>
                   </configuration>
                </execution>
             </executions>
@@ -94,7 +96,6 @@
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>properties-maven-plugin</artifactId>
-            <version>1.0-alpha-2</version>
             <executions>
                <execution>
                   <phase>initialize</phase>
@@ -111,18 +112,17 @@
             </executions>
          </plugin>
         <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-                <includes>
-                    <include>**/AllUnitTestSuite.class</include>
-                </includes>
+               <includes>
+                  <include>**/AllUnitTestSuite.class</include>
+               </includes>
             </configuration>
-        </plugin>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19</version>
             <executions>
                <execution>
                   <id>integration-tests</id>
@@ -139,7 +139,6 @@
                </execution>
             </executions>
          </plugin>
-         <!-- Fetch and unpack Alfresco Repository/Share WAR (alfresco.war or share.war) -->
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
@@ -164,8 +163,6 @@
                </execution>
             </executions>
          </plugin>
-         <!-- The current AMP artifact is installed into the Alfresco.war or share.war
-            using alfresco-maven-plugin -->
          <plugin>
             <groupId>org.alfresco.maven.plugin</groupId>
             <artifactId>alfresco-maven-plugin</artifactId>
@@ -199,11 +196,6 @@
                   </goals>
                </execution>
             </executions>
-            <configuration>
-               <!-- We need to selectively not install web resources (i.e. /web folder in AMP),
-                  so these files can be picked up directly from the build project instead,
-                  enabling rapid application dev -->
-            </configuration>
          </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -224,7 +216,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.4</version>
             <executions>
                <execution>
                   <id>attach-sources</id>
@@ -237,11 +228,9 @@
       </plugins>
       <pluginManagement>
          <plugins>
-            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
             <plugin>
                <groupId>org.eclipse.m2e</groupId>
                <artifactId>lifecycle-mapping</artifactId>
-               <version>1.0.0</version>
                <configuration>
                   <lifecycleMappingMetadata>
                      <pluginExecutions>
@@ -272,12 +261,10 @@
          <artifactId>gson</artifactId>
          <version>2.3.1</version>
       </dependency>
-      <!-- Alfresco dependencies -->
       <dependency>
          <groupId>${alfresco.groupId}</groupId>
          <artifactId>alfresco-remote-api</artifactId>
       </dependency>
-      <!-- Test dependencies -->
       <dependency>
          <groupId>io.takari.junit</groupId>
          <artifactId>takari-cpsuite</artifactId>
@@ -320,7 +307,6 @@
          <classifier>tests</classifier>
          <scope>test</scope>
       </dependency>
-      <!-- Database drivers -->
       <dependency>
          <groupId>postgresql</groupId>
          <artifactId>postgresql</artifactId>
@@ -373,7 +359,6 @@
          <id>start-repo</id>
          <build>
             <plugins>
-               <!-- Fetch and unpack Alfresco Repository / Share / Solr in the target / folder -->
                <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-dependency-plugin</artifactId>
@@ -396,7 +381,6 @@
                            </artifactItems>
                         </configuration>
                      </execution>
-                     <!-- Extract Solr config -->
                      <execution>
                         <id>unpack-alfresco-config</id>
                         <goals>
@@ -418,7 +402,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
                <plugin>
                   <groupId>org.alfresco.maven.plugin</groupId>
                   <artifactId>alfresco-maven-plugin</artifactId>
@@ -432,15 +415,12 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <!-- We need to selectively not install web resources so to enable rapid dev -->
                      <includeWebResources>false</includeWebResources>
                   </configuration>
                </plugin>
-               <!-- Fix the path when we are running on WINDOWS -->
                <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>build-helper-maven-plugin</artifactId>
-                  <version>1.8</version>
                   <executions>
                      <execution>
                         <id>regex-property</id>
@@ -458,7 +438,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <!-- Replaces values in Solr config -->
                <plugin>
                   <groupId>com.google.code.maven-replacer-plugin</groupId>
                   <artifactId>replacer</artifactId>
@@ -543,26 +522,15 @@
                </plugin>
             </plugins>
          </build>
-         <!--
-         <dependencies>
-            <dependency>
-               <groupId>org.alfresco.maven</groupId>
-               <artifactId>alfresco-rad</artifactId>
-               <version>${maven.alfresco.version}</version>
-            </dependency>
-         </dependencies>
-         -->
       </profile>
 
       <profile>
          <id>wipeDB</id>
          <build>
             <plugins>
-               <!-- Wipe the database before starting tests -->
                <plugin>
                   <groupId>org.codehaus.mojo</groupId>
                   <artifactId>sql-maven-plugin</artifactId>
-                  <version>1.5</version>
                   <configuration>
                      <autocommit>true</autocommit>
                      <driver>${alfresco.db.datasource.class}</driver>
@@ -608,6 +576,5 @@
             </plugins>
          </build>
       </profile>
-
    </profiles>
 </project>
\ No newline at end of file