From fafd5a1c3764ba9561aa951fe843dd4bf68c88c8 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Sat, 20 Apr 2019 07:14:30 -0400
Subject: [PATCH] Resolve failsafe plugin naming convention

updated IT*.java naming to It*.java

Issue-ID: OPTFRA-474
Change-Id: If96776af5b10fe712a5b72138af9d65b67bb271e
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-sonar/pom.xml                                           | 12 +++++++++++-
 .../java/org/onap/optf/cmso/it/ItFullIntegrationTest.java    |  2 +-
 cmso-sonar/src/{it => test}/resources/integration.properties |  0
 3 files changed, 12 insertions(+), 2 deletions(-)
 rename cmso-sonar/src/{it => test}/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java (98%)
 rename cmso-sonar/src/{it => test}/resources/integration.properties (100%)

diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 3f0815f..b5d22d8 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -87,11 +87,21 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>**/It*.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<configuration>
-					<testSourceDirectory>${project.basedir}/src/it/java</testSourceDirectory>
+					<includes>
+						<include>**/It*.java</include>
+					</includes>
 					<skipITs>${skipIntegrationTests}</skipITs>
 				</configuration>
 			</plugin>
diff --git a/cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java b/cmso-sonar/src/test/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
similarity index 98%
rename from cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
rename to cmso-sonar/src/test/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
index d6eccb3..aa3779a 100644
--- a/cmso-sonar/src/it/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
+++ b/cmso-sonar/src/test/java/org/onap/optf/cmso/it/ItFullIntegrationTest.java
@@ -34,7 +34,7 @@ public class ItFullIntegrationTest {
 
     @Test
     public void runTest() throws IOException {
-        InputStream is = new FileInputStream(new File("src/it/resources/integration.properties"));
+        InputStream is = new FileInputStream(new File("src/test/resources/integration.properties"));
         env.load(is);
         Process process = null;
         try {
diff --git a/cmso-sonar/src/it/resources/integration.properties b/cmso-sonar/src/test/resources/integration.properties
similarity index 100%
rename from cmso-sonar/src/it/resources/integration.properties
rename to cmso-sonar/src/test/resources/integration.properties
-- 
2.16.6