From 401d211fa92b20936c5572c9fb78d9a524d783e5 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 16 Nov 2016 22:18:42 +0000
Subject: [PATCH] RM-4347 (Restructure RM Projects)

---
 rm-automation/pom.xml                         | 14 ++++++++++++++
 .../rm-automation-community-rest-api/pom.xml  | 19 -------------------
 .../src/test/resources/testng.xml             |  1 -
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index 61a7768fbc..9b8f5ee2e1 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -25,6 +25,10 @@
 
    <properties>
       <alfresco.installer.host>nightlybuilds</alfresco.installer.host>
+      <maven.compiler.source>1.8</maven.compiler.source>
+      <maven.compiler.target>1.8</maven.compiler.target>
+      <suiteXmlFile>testng.xml</suiteXmlFile>
+      <skip.automationtests>true</skip.automationtests>
    </properties>
 
    <build>
@@ -45,6 +49,16 @@
                </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>
       </plugins>
       <pluginManagement>
          <plugins>
diff --git a/rm-automation/rm-automation-community-rest-api/pom.xml b/rm-automation/rm-automation-community-rest-api/pom.xml
index 317d05f586..57e4a00054 100644
--- a/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -12,10 +12,6 @@
    </parent>
 
    <properties>
-      <maven.compiler.source>1.8</maven.compiler.source>
-      <maven.compiler.target>1.8</maven.compiler.target>
-      <suiteXmlFile>testng.xml</suiteXmlFile>
-      <skip.automationtests>true</skip.automationtests>
       <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
       <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
    </properties>
@@ -38,19 +34,4 @@
          <version>2.0.0</version>
       </dependency>
    </dependencies>
-
-   <build>
-      <plugins>
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <redirectTestOutputToFile>false</redirectTestOutputToFile>
-               <suiteXmlFiles>
-                  <suiteXmlFile>${project.build.testOutputDirectory}/${suiteXmlFile}</suiteXmlFile>
-               </suiteXmlFiles>
-               <skipTests>${skip.automationtests}</skipTests>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
 </project>
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml b/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml
index ed47d376d7..c2d8684f0c 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml
+++ b/rm-automation/rm-automation-community-rest-api/src/test/resources/testng.xml
@@ -1,7 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="TestNG AllTestSuite" verbose="1" time-out="300000">
-
    <test name="restapi">
       <packages>
          <package name="org.alfresco.rest.rm.*"/>