diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index a75f39ae82..0721cea0c4 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -27,15 +27,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <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>
+                  <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>
@@ -244,19 +244,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
                            <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-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-community-repo</artifactId>
                                  <version>${project.version}</version>
                                  <type>amp</type>
                               </artifactItem>
@@ -279,18 +279,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
                   <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-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>
@@ -300,18 +300,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
                            <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-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>
diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml
index 09727879a5..d55da9e478 100644
--- a/rm-community/rm-community-repo/pom.xml
+++ b/rm-community/rm-community-repo/pom.xml
@@ -1,217 +1,210 @@
-<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/maven-v4_0_0.xsd">
-
-   <modelVersion>4.0.0</modelVersion>
-   <artifactId>alfresco-rm-community-repo</artifactId>
-   <name>Alfresco Records Management Community Repo</name>
+<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/maven-v4_0_0.xsd">
+
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>alfresco-rm-community-repo</artifactId>
+   <name>Alfresco Records Management Community Repo</name>
    <description>Alfresco Record Management Core Repository Extension</description>
-   <packaging>amp</packaging>
-
-   <parent>
-      <groupId>org.alfresco</groupId>
-      <artifactId>alfresco-rm-community</artifactId>
+   <packaging>amp</packaging>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>alfresco-rm-community</artifactId>
       <version>2.5-SNAPSHOT</version>
-   </parent>
-
-   <properties>
-      <alfresco.data.location>${basedir}/target/alf_test_data</alfresco.data.location>
-      <alfresco.db.hibernate.dialect>org.hibernate.dialect.H2Dialect</alfresco.db.hibernate.dialect>
-      <alfresco.db.name>alfresco</alfresco.db.name>
-      <alfresco.db.username>alfresco</alfresco.db.username>
-      <alfresco.db.password>alfresco</alfresco.db.password>
-      <alfresco.db.host>localhost</alfresco.db.host>
-      <alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
-      <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
-      <alfresco.mysql.version>5.1.31</alfresco.mysql.version>
-      <alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
-      <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>
-         <testResource>
-            <directory>unit-test/resources</directory>
-         </testResource>
-         <testResource>
-            <directory>test/resources</directory>
-         </testResource>
-      </testResources>
-      <plugins>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>add-source</id>
-                  <goals>
-                     <goal>add-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>source/compatibility</source>
-                     </sources>
-                  </configuration>
-               </execution>
-               <execution>
-                  <id>add-test-source</id>
-                  <goals>
-                     <goal>add-test-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>unit-test/java</source>
-                     </sources>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-               <execution>
-                  <phase>prepare-package</phase>
-                  <goals>
-                     <goal>run</goal>
-                  </goals>
-                  <configuration>
-                     <target>
+   </parent>
+
+   <properties>
+      <alfresco.data.location>${basedir}/target/alf_test_data</alfresco.data.location>
+      <alfresco.db.hibernate.dialect>org.hibernate.dialect.H2Dialect</alfresco.db.hibernate.dialect>
+      <alfresco.db.name>alfresco</alfresco.db.name>
+      <alfresco.db.username>alfresco</alfresco.db.username>
+      <alfresco.db.password>alfresco</alfresco.db.password>
+      <alfresco.db.host>localhost</alfresco.db.host>
+      <alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
+      <alfresco.postgres.version>9.1-901.jdbc4</alfresco.postgres.version>
+      <alfresco.mysql.version>5.1.31</alfresco.mysql.version>
+      <alfresco.rm.artifactId>alfresco-rm-community-repo</alfresco.rm.artifactId>
+      <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>
+         <testResource>
+            <directory>unit-test/resources</directory>
+         </testResource>
+         <testResource>
+            <directory>test/resources</directory>
+         </testResource>
+      </testResources>
+      <plugins>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>add-source</id>
+                  <goals>
+                     <goal>add-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>source/compatibility</source>
+                     </sources>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>add-test-source</id>
+                  <goals>
+                     <goal>add-test-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>unit-test/java</source>
+                     </sources>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>prepare-package</phase>
+                  <goals>
+                     <goal>run</goal>
+                  </goals>
+                  <configuration>
+                     <target>
                         <copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
-                           <fileset dir="${project.build.outputDirectory}/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}" />
-                     </target>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
+                     </target>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>properties-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <phase>initialize</phase>
+                  <goals>
+                     <goal>read-project-properties</goal>
+                  </goals>
+                  <configuration>
+                     <files>
+                        <file>${basedir}/src/main/resources/local.properties</file>
+                     </files>
+                     <quiet>true</quiet>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>properties-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <phase>initialize</phase>
-                  <goals>
-                     <goal>read-project-properties</goal>
-                  </goals>
-                  <configuration>
-                     <files>
-                        <file>${basedir}/src/main/resources/local.properties</file>
-                     </files>
-                     <quiet>true</quiet>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <includes>
-                  <include>**/AllUnitTestSuite.class</include>
-               </includes>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>integration-tests</id>
-                  <goals>
-                     <goal>integration-test</goal>
-                     <goal>verify</goal>
-                  </goals>
-                  <configuration>
-                      <skipTests>${skip.integrationtests}</skipTests>
-                      <includes>
-                         <include>**/AllTestSuite.class</include>
-                      </includes>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>unpack-alfresco</id>
-                  <phase>prepare-package</phase>
-                  <goals>
-                     <goal>unpack</goal>
-                  </goals>
-                  <configuration>
-                     <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
-                     <artifactItems>
-                        <artifactItem>
-                           <groupId>${alfresco.groupId}</groupId>
-                           <artifactId>${app.amp.client.war.artifactId}</artifactId>
-                           <type>war</type>
-                           <version>${alfresco.version}</version>
-                        </artifactItem>
-                     </artifactItems>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.alfresco.maven.plugin</groupId>
-            <artifactId>alfresco-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>attach-rm-jar</id>
-                  <goals>
-                     <goal>amp</goal>
-                  </goals>
-                  <configuration>
-                     <attachClasses>true</attachClasses>
-                     <includeDependencies>true</includeDependencies>
-                  </configuration>
-               </execution>
-               <execution>
-                  <id>install-rm-amp</id>
-                  <goals>
-                     <goal>install</goal>
-                  </goals>
-                  <phase>package</phase>
-                  <configuration>
-                     <backup>true</backup>
-                     <ampLocation>${project.build.directory}/${alfresco.rm.artifactId}-${alfresco.rm.version}.amp</ampLocation>
-                  </configuration>
-               </execution>
-               <execution>
-                  <id>amps-to-war-overlay</id>
-                  <phase>package</phase>
-                  <goals>
-                     <goal>install</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>test-jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <excludes>
-                  <exclude>**/alfresco-global.properties</exclude>
-               </excludes>
-            </configuration>
-         </plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <includes>
+                  <include>**/AllUnitTestSuite.class</include>
+               </includes>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>integration-tests</id>
+                  <goals>
+                     <goal>integration-test</goal>
+                     <goal>verify</goal>
+                  </goals>
+                  <configuration>
+                     <skipTests>${skip.integrationtests}</skipTests>
+                     <includes>
+                        <include>**/AllTestSuite.class</include>
+                     </includes>
+                     <additionalClasspathElements>
+                        <additionalClasspathElement>${project.build.directory}/${project.build.finalName}/config</additionalClasspathElement>
+                     </additionalClasspathElements>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>unpack-alfresco</id>
+                  <phase>prepare-package</phase>
+                  <goals>
+                     <goal>unpack</goal>
+                  </goals>
+                  <configuration>
+                     <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
+                     <artifactItems>
+                        <artifactItem>
+                           <groupId>${alfresco.groupId}</groupId>
+                           <artifactId>${app.amp.client.war.artifactId}</artifactId>
+                           <type>war</type>
+                           <version>${alfresco.version}</version>
+                        </artifactItem>
+                     </artifactItems>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.alfresco.maven.plugin</groupId>
+            <artifactId>alfresco-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>attach-rm-jar</id>
+                  <goals>
+                     <goal>amp</goal>
+                  </goals>
+                  <configuration>
+                     <attachClasses>true</attachClasses>
+                     <attachConfig>true</attachConfig>
+                     <includeDependencies>true</includeDependencies>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>amps-to-war-overlay</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>install</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+               <execution>
+                  <goals>
+                     <goal>test-jar</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <configuration>
+               <excludes>
+                  <exclude>**/alfresco-global.properties</exclude>
+               </excludes>
+            </configuration>
+         </plugin>
 
             <!-- License header generation -->
             <plugin>
@@ -230,398 +223,396 @@
                </configuration>
             </plugin>
 
-      </plugins>
-      <pluginManagement>
-         <plugins>
-            <plugin>
-               <groupId>org.eclipse.m2e</groupId>
-               <artifactId>lifecycle-mapping</artifactId>
-               <configuration>
-                  <lifecycleMappingMetadata>
-                     <pluginExecutions>
-                        <pluginExecution>
+      </plugins>
+      <pluginManagement>
+         <plugins>
+            <plugin>
+               <groupId>org.eclipse.m2e</groupId>
+               <artifactId>lifecycle-mapping</artifactId>
+               <configuration>
+                  <lifecycleMappingMetadata>
+                     <pluginExecutions>
+                        <pluginExecution>
+                           <pluginExecutionFilter>
+                              <groupId>org.codehaus.mojo</groupId>
+                              <artifactId>properties-maven-plugin</artifactId>
+                              <versionRange>[1.0-alpha-2,)</versionRange>
+                              <goals>
+                                 <goal>read-project-properties</goal>
+                              </goals>
+                           </pluginExecutionFilter>
+                           <action>
+                              <ignore />
+                           </action>
+                        </pluginExecution>
+                        <pluginExecution>
                            <pluginExecutionFilter>
                               <groupId>org.codehaus.mojo</groupId>
-                              <artifactId>properties-maven-plugin</artifactId>
-                              <versionRange>[1.0-alpha-2,)</versionRange>
+                              <artifactId>license-maven-plugin</artifactId>
+                              <versionRange>[1.8,)</versionRange>
                               <goals>
-                                 <goal>read-project-properties</goal>
+                                 <goal>update-file-header</goal>
                               </goals>
                            </pluginExecutionFilter>
                            <action>
                               <ignore />
                            </action>
-                        </pluginExecution>
-                        <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>${alfresco.groupId}</groupId>
-         <artifactId>alfresco-remote-api</artifactId>
+                        </pluginExecution>
+                     </pluginExecutions>
+                  </lifecycleMappingMetadata>
+               </configuration>
+            </plugin>
+         </plugins>
+      </pluginManagement>
+   </build>
+
+   <dependencies>
+      <dependency>
+         <groupId>${alfresco.groupId}</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>io.takari.junit</groupId>
+         <artifactId>takari-cpsuite</artifactId>
+         <version>1.2.7</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework.extensions.surf</groupId>
+         <artifactId>spring-webscripts</artifactId>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-all</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.springframework</groupId>
+         <artifactId>spring-test</artifactId>
+         <version>2.5</version>
+         <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>io.takari.junit</groupId>
-         <artifactId>takari-cpsuite</artifactId>
-         <version>1.2.7</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.springframework.extensions.surf</groupId>
-         <artifactId>spring-webscripts</artifactId>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.mockito</groupId>
-         <artifactId>mockito-all</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.springframework</groupId>
-         <artifactId>spring-test</artifactId>
-         <version>2.5</version>
-         <scope>test</scope>
-       </dependency>
-       <dependency>
-         <groupId>${alfresco.groupId}</groupId>
-         <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco.version}</version>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
-         <artifactId>alfresco-remote-api</artifactId>
-         <version>${alfresco.version}</version>
-         <classifier>tests</classifier>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>postgresql</groupId>
-         <artifactId>postgresql</artifactId>
-         <version>${alfresco.postgres.version}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>mysql</groupId>
-         <artifactId>mysql-connector-java</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>${alfresco.groupId}</groupId>
-         <artifactId>alfresco-repository</artifactId>
-         <version>${alfresco.version}</version>
-         <classifier>h2scripts</classifier>
-         <exclusions>
-            <exclusion>
-               <groupId>*</groupId>
-               <artifactId>*</artifactId>
-            </exclusion>
-         </exclusions>
-         <scope>test</scope>
-      </dependency>
+         <groupId>${alfresco.groupId}</groupId>
+         <artifactId>alfresco-repository</artifactId>
+         <version>${alfresco.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>${alfresco.groupId}</groupId>
+         <artifactId>alfresco-remote-api</artifactId>
+         <version>${alfresco.version}</version>
+         <classifier>tests</classifier>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+         <version>${alfresco.postgres.version}</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>mysql</groupId>
+         <artifactId>mysql-connector-java</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>${alfresco.groupId}</groupId>
+         <artifactId>alfresco-repository</artifactId>
+         <version>${alfresco.version}</version>
+         <classifier>h2scripts</classifier>
+         <exclusions>
+            <exclusion>
+               <groupId>*</groupId>
+               <artifactId>*</artifactId>
+            </exclusion>
+         </exclusions>
+         <scope>test</scope>
+      </dependency>
       <dependency>
           <groupId>org.reflections</groupId>
           <artifactId>reflections</artifactId>
           <scope>test</scope>
       </dependency>
-   </dependencies>
-
-   <profiles>
-      <profile>
-         <id>use-mysql</id>
-         <properties>
-            <alfresco.db.name>${my.db.name}</alfresco.db.name>
-            <alfresco.db.port>${my.db.port}</alfresco.db.port>
-            <alfresco.db.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
-            <alfresco.db.params />
-            <alfresco.db.master.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.master.url>
-            <alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url>
-            <alfresco.db.datasource.class>org.gjt.mm.mysql.Driver</alfresco.db.datasource.class>
-         </properties>
-      </profile>
-      <profile>
-         <id>use-postgres</id>
-         <properties>
-            <alfresco.db.name>${my.db.name}</alfresco.db.name>
-            <alfresco.db.port>${my.db.port}</alfresco.db.port>
-            <alfresco.db.hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</alfresco.db.hibernate.dialect>
-            <alfresco.db.params />
-            <alfresco.db.master.url>jdbc:postgresql:template1</alfresco.db.master.url>
-            <alfresco.db.url>jdbc:postgresql:${alfresco.db.name}</alfresco.db.url>
-            <alfresco.db.datasource.class>org.postgresql.Driver</alfresco.db.datasource.class>
-         </properties>
-      </profile>
-      <profile>
-         <id>start-repo</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>unpack-alfresco</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                           <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                           <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
-                           <artifactItems>
-                              <artifactItem>
-                                 <groupId>${alfresco.groupId}</groupId>
-                                 <artifactId>${alfresco.repo.artifactId}</artifactId>
-                                 <type>war</type>
-                                 <version>${alfresco.version}</version>
-                              </artifactItem>
-                           </artifactItems>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>unpack-alfresco-config</id>
-                        <goals>
-                           <goal>unpack</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                           <outputDirectory>${alfresco.solr.home}</outputDirectory>
-                           <artifactItems>
-                              <artifactItem>
-                                 <artifactId>alfresco-solr4</artifactId>
-                                 <groupId>${alfresco.groupId}</groupId>
-                                 <classifier>config</classifier>
-                                 <version>${alfresco.version}</version>
-                                 <type>zip</type>
-                              </artifactItem>
-                           </artifactItems>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>org.alfresco.maven.plugin</groupId>
-                  <artifactId>alfresco-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>amps-to-war-overlay</id>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>install</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <includeWebResources>false</includeWebResources>
-                  </configuration>
-               </plugin>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>build-helper-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>regex-property</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                           <goal>regex-property</goal>
-                        </goals>
-                        <configuration>
-                           <name>solrHomePath</name>
-                           <value>${alfresco.solr.home}</value>
-                           <regex>\\</regex>
-                           <replacement>\\\\</replacement>
-                           <failIfNoMatch>false</failIfNoMatch>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <groupId>com.google.code.maven-replacer-plugin</groupId>
-                  <artifactId>replacer</artifactId>
-                  <executions>
-                     <execution>
-                        <id>setup-solr-config</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                           <goal>replace</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <regex>false</regex>
-                     <includes>
-                        <include>${alfresco.solr.home}/context.xml</include>
-                        <include>${alfresco.solr.home}/archive-SpacesStore/conf/solrcore.properties</include>
-                        <include>${alfresco.solr.home}/workspace-SpacesStore/conf/solrcore.properties</include>
-                        <include>${app.amp.client.war.folder}/WEB-INF/web.xml</include>
-                     </includes>
-                     <replacements>
-                        <replacement>
-                           <token>@@ALFRESCO_SOLR4_DIR@@</token>
-                           <value>${solrHomePath}/</value>
-                        </replacement>
-                        <replacement>
-                           <token>@@ALFRESCO_SOLR4_MODEL_DIR@@</token>
-                           <value>${solrHomePath}/alfrescoModels/</value>
-                        </replacement>
-                        <replacement>
-                           <token>@@ALFRESCO_SOLR4_CONTENT_DIR@@</token>
-                           <value>${solrHomePath}/data/content/</value>
-                        </replacement>
-                        <replacement>
-                           <token>@@ALFRESCO_SOLR4_DATA_DIR@@</token>
-                           <value>${solrHomePath}/data/index/</value>
-                        </replacement>
-                        <replacement>
-                           <token><![CDATA[<!-- Toggle securecomms placeholder start -->]]></token>
-                           <value><![CDATA[<!--]]></value>
-                        </replacement>
-                        <replacement>
-                           <token><![CDATA[<!-- Toggle securecomms placeholder end -->]]></token>
-                           <value><![CDATA[-->]]></value>
-                        </replacement>
-                     </replacements>
-                  </configuration>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.tomcat.maven</groupId>
-                  <artifactId>tomcat7-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>run-embedded</id>
-                        <goals>
-                           <goal>run</goal>
-                        </goals>
-                        <phase>integration-test</phase>
-                        <configuration>
-                           <useTestClasspath>false</useTestClasspath>
-                           <ignorePackaging>true</ignorePackaging>
-                           <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                           <systemProperties>
-                              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-                           </systemProperties>
-                           <delegate>false</delegate>
-                           <contextFile>${project.basedir}/tomcat/context.xml</contextFile>
-                           <webapps>
-                              <webapp>
-                                 <groupId>${alfresco.groupId}</groupId>
-                                 <artifactId>alfresco-solr4</artifactId>
-                                 <version>${alfresco.version}</version>
-                                 <type>war</type>
-                                 <asWebapp>true</asWebapp>
-                                 <contextPath>/solr4</contextPath>
-                                 <contextFile>${alfresco.solr.home}/context.xml</contextFile>
-                              </webapp>
-                           </webapps>
-                        </configuration>
-                     </execution>
-                  </executions>
-                  <dependencies>
-                     <dependency>
-                        <groupId>postgresql</groupId>
-                        <artifactId>postgresql</artifactId>
-                        <version>${alfresco.postgres.version}</version>
-                     </dependency>
-                     <dependency>
-                        <groupId>mysql</groupId>
-                        <artifactId>mysql-connector-java</artifactId>
-                        <version>${alfresco.mysql.version}</version>
-                     </dependency>
-                     <dependency>
-                        <groupId>${alfresco.groupId}</groupId>
-                        <artifactId>alfresco-repository</artifactId>
-                        <version>${alfresco.version}</version>
-                        <classifier>h2scripts</classifier>
-                        <exclusions>
-                           <exclusion>
-                              <groupId>*</groupId>
-                              <artifactId>*</artifactId>
-                           </exclusion>
-                        </exclusions>
-                     </dependency>
-                  </dependencies>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
-      <profile>
-         <id>wipeDB</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>sql-maven-plugin</artifactId>
-                  <configuration>
-                     <autocommit>true</autocommit>
-                     <driver>${alfresco.db.datasource.class}</driver>
-                     <url>${alfresco.db.master.url}</url>
-                     <username>${alfresco.db.username}</username>
-                     <password>${alfresco.db.password}</password>
-                  </configuration>
-                  <dependencies>
-                     <dependency>
-                        <groupId>postgresql</groupId>
-                        <artifactId>postgresql</artifactId>
-                        <version>${alfresco.postgres.version}</version>
-                     </dependency>
-                     <dependency>
-                        <groupId>mysql</groupId>
-                        <artifactId>mysql-connector-java</artifactId>
-                        <version>${alfresco.mysql.version}</version>
-                     </dependency>
-                  </dependencies>
-                  <executions>
-                     <execution>
-                        <id>wipe-database</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                           <sqlCommand>drop database if exists alfresco</sqlCommand>
-                        </configuration>
-                     </execution>
-                     <execution>
-                        <id>create-database</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                           <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                           <sqlCommand>create database alfresco</sqlCommand>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
+   </dependencies>
+
+   <profiles>
+      <profile>
+         <id>use-mysql</id>
+         <properties>
+            <alfresco.db.name>${my.db.name}</alfresco.db.name>
+            <alfresco.db.port>${my.db.port}</alfresco.db.port>
+            <alfresco.db.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
+            <alfresco.db.params />
+            <alfresco.db.master.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.master.url>
+            <alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url>
+            <alfresco.db.datasource.class>org.gjt.mm.mysql.Driver</alfresco.db.datasource.class>
+         </properties>
+      </profile>
+      <profile>
+         <id>use-postgres</id>
+         <properties>
+            <alfresco.db.name>${my.db.name}</alfresco.db.name>
+            <alfresco.db.port>${my.db.port}</alfresco.db.port>
+            <alfresco.db.hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</alfresco.db.hibernate.dialect>
+            <alfresco.db.params />
+            <alfresco.db.master.url>jdbc:postgresql:template1</alfresco.db.master.url>
+            <alfresco.db.url>jdbc:postgresql:${alfresco.db.name}</alfresco.db.url>
+            <alfresco.db.datasource.class>org.postgresql.Driver</alfresco.db.datasource.class>
+         </properties>
+      </profile>
+      <profile>
+         <id>start-repo</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-dependency-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>unpack-alfresco</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                           <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                           <outputDirectory>${app.amp.client.war.folder}</outputDirectory>
+                           <artifactItems>
+                              <artifactItem>
+                                 <groupId>${alfresco.groupId}</groupId>
+                                 <artifactId>${alfresco.repo.artifactId}</artifactId>
+                                 <type>war</type>
+                                 <version>${alfresco.version}</version>
+                              </artifactItem>
+                           </artifactItems>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>unpack-alfresco-config</id>
+                        <goals>
+                           <goal>unpack</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                           <outputDirectory>${alfresco.solr.home}</outputDirectory>
+                           <artifactItems>
+                              <artifactItem>
+                                 <artifactId>alfresco-solr4</artifactId>
+                                 <groupId>${alfresco.groupId}</groupId>
+                                 <classifier>config</classifier>
+                                 <version>${alfresco.version}</version>
+                                 <type>zip</type>
+                              </artifactItem>
+                           </artifactItems>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>org.alfresco.maven.plugin</groupId>
+                  <artifactId>alfresco-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>amps-to-war-overlay</id>
+                        <phase>package</phase>
+                        <goals>
+                           <goal>install</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+                  <configuration>
+                     <includeWebResources>false</includeWebResources>
+                  </configuration>
+               </plugin>
+               <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>build-helper-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>regex-property</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                           <goal>regex-property</goal>
+                        </goals>
+                        <configuration>
+                           <name>solrHomePath</name>
+                           <value>${alfresco.solr.home}</value>
+                           <regex>\\</regex>
+                           <replacement>\\\\</replacement>
+                           <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <groupId>com.google.code.maven-replacer-plugin</groupId>
+                  <artifactId>replacer</artifactId>
+                  <executions>
+                     <execution>
+                        <id>setup-solr-config</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                           <goal>replace</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+                  <configuration>
+                     <regex>false</regex>
+                     <includes>
+                        <include>${alfresco.solr.home}/context.xml</include>
+                        <include>${alfresco.solr.home}/archive-SpacesStore/conf/solrcore.properties</include>
+                        <include>${alfresco.solr.home}/workspace-SpacesStore/conf/solrcore.properties</include>
+                        <include>${app.amp.client.war.folder}/WEB-INF/web.xml</include>
+                     </includes>
+                     <replacements>
+                        <replacement>
+                           <token>@@ALFRESCO_SOLR4_DIR@@</token>
+                           <value>${solrHomePath}/</value>
+                        </replacement>
+                        <replacement>
+                           <token>@@ALFRESCO_SOLR4_MODEL_DIR@@</token>
+                           <value>${solrHomePath}/alfrescoModels/</value>
+                        </replacement>
+                        <replacement>
+                           <token>@@ALFRESCO_SOLR4_CONTENT_DIR@@</token>
+                           <value>${solrHomePath}/data/content/</value>
+                        </replacement>
+                        <replacement>
+                           <token>@@ALFRESCO_SOLR4_DATA_DIR@@</token>
+                           <value>${solrHomePath}/data/index/</value>
+                        </replacement>
+                        <replacement>
+                           <token><![CDATA[<!-- Toggle securecomms placeholder start -->]]></token>
+                           <value><![CDATA[<!--]]></value>
+                        </replacement>
+                        <replacement>
+                           <token><![CDATA[<!-- Toggle securecomms placeholder end -->]]></token>
+                           <value><![CDATA[-->]]></value>
+                        </replacement>
+                     </replacements>
+                  </configuration>
+               </plugin>
+               <plugin>
+                  <groupId>org.apache.tomcat.maven</groupId>
+                  <artifactId>tomcat7-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>run-embedded</id>
+                        <goals>
+                           <goal>run</goal>
+                        </goals>
+                        <phase>integration-test</phase>
+                        <configuration>
+                           <useTestClasspath>false</useTestClasspath>
+                           <ignorePackaging>true</ignorePackaging>
+                           <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                           <systemProperties>
+                              <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+                           </systemProperties>
+                           <delegate>false</delegate>
+                           <contextFile>${project.basedir}/tomcat/context.xml</contextFile>
+                           <webapps>
+                              <webapp>
+                                 <groupId>${alfresco.groupId}</groupId>
+                                 <artifactId>alfresco-solr4</artifactId>
+                                 <version>${alfresco.version}</version>
+                                 <type>war</type>
+                                 <asWebapp>true</asWebapp>
+                                 <contextPath>/solr4</contextPath>
+                                 <contextFile>${alfresco.solr.home}/context.xml</contextFile>
+                              </webapp>
+                           </webapps>
+                        </configuration>
+                     </execution>
+                  </executions>
+                  <dependencies>
+                     <dependency>
+                        <groupId>postgresql</groupId>
+                        <artifactId>postgresql</artifactId>
+                        <version>${alfresco.postgres.version}</version>
+                     </dependency>
+                     <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>${alfresco.mysql.version}</version>
+                     </dependency>
+                     <dependency>
+                        <groupId>${alfresco.groupId}</groupId>
+                        <artifactId>alfresco-repository</artifactId>
+                        <version>${alfresco.version}</version>
+                        <classifier>h2scripts</classifier>
+                        <exclusions>
+                           <exclusion>
+                              <groupId>*</groupId>
+                              <artifactId>*</artifactId>
+                           </exclusion>
+                        </exclusions>
+                     </dependency>
+                  </dependencies>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+
+      <profile>
+         <id>wipeDB</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>sql-maven-plugin</artifactId>
+                  <configuration>
+                     <autocommit>true</autocommit>
+                     <driver>${alfresco.db.datasource.class}</driver>
+                     <url>${alfresco.db.master.url}</url>
+                     <username>${alfresco.db.username}</username>
+                     <password>${alfresco.db.password}</password>
+                  </configuration>
+                  <dependencies>
+                     <dependency>
+                        <groupId>postgresql</groupId>
+                        <artifactId>postgresql</artifactId>
+                        <version>${alfresco.postgres.version}</version>
+                     </dependency>
+                     <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>${alfresco.mysql.version}</version>
+                     </dependency>
+                  </dependencies>
+                  <executions>
+                     <execution>
+                        <id>wipe-database</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                           <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                           <sqlCommand>drop database if exists alfresco</sqlCommand>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>create-database</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                           <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                           <sqlCommand>create database alfresco</sqlCommand>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
 </project>
\ No newline at end of file