From dab870c8f5c46c73da842c32e758cdc197c6918b Mon Sep 17 00:00:00 2001
From: Michael Suzuki <michael.suzuki@gmail.com>
Date: Fri, 5 Sep 2014 14:06:34 +0100
Subject: [PATCH] fix to run testng in functional and integration tests

---
 poms/alfresco-sdk-parent/pom.xml | 222 ++++++++++++++++---------------
 1 file changed, 112 insertions(+), 110 deletions(-)

diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 5ea092f8..41eb26d8 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -760,118 +760,120 @@
         </build>
     </profile>
     <profile>
-        <id>ui-test</id>
-        <properties>
-            <maven.tomcat.fork>true</maven.tomcat.fork>
-        </properties>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.7</version>
-                    <executions>
-                        <execution>
-                            <id>add-integration-source</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>add-test-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>src/integration/java</source>
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.5</version>
-                    <executions>
-                        <execution>
-                            <id>add-integration-resources</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/integration-classes</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory>src/integration/resources</directory>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                  </plugin>
-                  <!-- In this case the maven-compiler-plugin must be located after the build-helper-maven-plugin -->
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-compiler-plugin</artifactId>
-                      <version>2.3.2</version>
-                      <executions>
-                          <execution>
-                              <id>compile-integration-test</id>
-                              <phase>pre-integration-test</phase>
-                              <goals>
-                                  <goal>testCompile</goal>
-                              </goals>
-                              <configuration>
-                                  <compilerArguments>
-                                      <d>${project.build.directory}/integration-classes</d>
-                                  </compilerArguments>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <version>2.9</version>
-                  </plugin>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-failsafe-plugin</artifactId>
-                      <version>2.9</version>
-                      <configuration>
-                          <testSourceDirectory>src/integration/java</testSourceDirectory>
-                          <testClassesDirectory>${project.build.directory}/integration-classes</testClassesDirectory>
-                          <test>**/*.java</test>
-                      </configuration>
-                      <executions>
-                          <execution>
-                              <id>integration-test</id>
-                              <goals>
-                                  <goal>integration-test</goal>
-                              </goals>
-                          </execution>
-                          <execution>
-                              <id>verify</id>
-                                  <goals>
-                                      <goal>verify</goal>
-                                  </goals>
-                          </execution>
-                      </executions>
-                  </plugin>
-              </plugins>
+      <id>ui-test</id>
+      <properties>
+        <maven.tomcat.fork>true</maven.tomcat.fork>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>add-integration-source</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>src/integration/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.5</version>
+            <executions>
+              <execution>
+                <id>add-integration-resources</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/integration-classes</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/integration/resources</directory>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+            <!-- In this case the maven-compiler-plugin must be located after the build-helper-maven-plugin -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>2.3.2</version>
+              <executions>
+                <execution>
+                  <id>compile-integration-test</id>
+                  <phase>pre-integration-test</phase>
+                  <goals>
+                    <goal>testCompile</goal>
+                  </goals>
+                  <configuration>
+                    <compilerArguments>
+                      <d>${project.build.directory}/integration-classes</d>
+                    </compilerArguments>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <version>2.9</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-failsafe-plugin</artifactId>
+              <version>2.10</version>
+              <configuration>
+                <testSourceDirectory>src/integration/java</testSourceDirectory>
+                <testClassesDirectory>${project.build.directory}/integration-classes</testClassesDirectory>
+                <suiteXmlFiles>
+                  <suiteXmlFile>src/integration/resources/testng.xml</suiteXmlFile>
+                </suiteXmlFiles>
+              </configuration>
+              <executions>
+                <execution>
+                  <id>integration-test</id>
+                  <goals>
+                    <goal>integration-test</goal>
+                  </goals>
+                </execution>
+                <execution>
+                  <id>verify</id>
+                  <goals>
+                    <goal>verify</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
         </build>
         <dependencies>
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <version>6.8.8</version>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+          <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>6.8.8</version>
+            <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest-core</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
         </dependencies>
-    </profile>
+      </profile>
   </profiles>
 </project>