From b38738cbbbcdc6fd4ec8e87d89c48bee45132868 Mon Sep 17 00:00:00 2001
From: an4828 <nekrassov@att.com>
Date: Thu, 14 Sep 2017 17:50:08 -0400
Subject: TCA: pom cleanup - fix merge job

Change-Id: I32f4ddfbba40044049b510573ae7bc5dcb890a4b
Signed-off-by: an4828 <nekrassov@att.com>
Issue-ID: DCAEGEN2-103
---
 pom.xml | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 508e52e..60028a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
         <!-- PLUGINS VERSIONS -->
         <compiler.plugin.version>3.3</compiler.plugin.version>
         <surefire.plugin.version>2.19.1</surefire.plugin.version>
+        <failsafe.plugin.version>2.19.1</failsafe.plugin.version>
         <bundle.plugin.version>2.5.4</bundle.plugin.version>
         <autorun.plugin.version>1.7</autorun.plugin.version>
         <eclipe.plugin.version>2.10</eclipe.plugin.version>
@@ -676,6 +677,28 @@
                     </dependencies>
                 </plugin>
 
+                <!-- FAIL SAFE PLUGIN FOR INTEGRATION TEST -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${failsafe.plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>integration-tests</id>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                                <skipTests>${skip.integration.tests}</skipTests>
+                                <!-- Sets the VM argument line used when integration tests are run. -->
+                                <!--suppress MavenModelInspection -->
+                                <argLine>${failsafeArgLine}</argLine>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+
                 <!-- FIND BUGS (STATIC CODE ANALYSIS) PLUGIN -->
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -892,9 +915,13 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
+                <artifactId>maven-failsafe-plugin</artifactId>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -924,7 +951,6 @@
         </plugins>
     </build>
 
-
     <reporting>
         <plugins>
             <plugin>
@@ -962,4 +988,4 @@
         <module>dcae-analytics-it</module>
     </modules>
 
-</project>
+</project>
\ No newline at end of file
-- 
cgit 1.2.3-korg