From c0c35e03c1dfc6f734f6acb0895f25a3e0790424 Mon Sep 17 00:00:00 2001
From: "M.Hosnidokht" <mohammad.hosnidokht@yoppworks.com>
Date: Wed, 22 Sep 2021 10:22:21 -0400
Subject: Fix integration tests

- Fixed the issue regarding docker image dependencies https://gerrit.onap.org/r/c/aai/traversal/+/123659
- Cleaned up pom file

Issue-ID: AAI-3325
Signed-off-by: Mohammad Hosnidokht <mohammad.hosnidokht@yoppworks.com>
Change-Id: I3a69e5881c2e7a3016efec491acb527f86077746
---
 aai-traversal/pom.xml | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

(limited to 'aai-traversal/pom.xml')

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 2cdfd32..13402a0 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -102,7 +102,9 @@
 		<micrometer-jersey2>1.6.6</micrometer-jersey2>
 		<testcontainers.version>1.6.1</testcontainers.version>
 		<!-- End of Default ONAP Schema Properties -->
-		<build.helper-maven-plugin.version>3.2.0</build.helper-maven-plugin.version>
+
+		<!-- Integration tests will be skipped by default. Could be enabled here or by -DskipITs=false-->
+		<skipITs>true</skipITs>
 	</properties>
 	<profiles>
 		<!-- Docker profile to be used for building docker image and pushing to 
@@ -1087,37 +1089,12 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${build.helper-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>add-integration-test-source</id>
-						<phase>generate-test-sources</phase>
-						<goals>
-							<goal>add-test-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/it/java</source>
-							</sources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>add-integration-test-resource</id>
-						<phase>generate-test-resources</phase>
-						<goals>
-							<goal>add-test-resource</goal>
-						</goals>
-						<configuration>
-							<resources>
-								<resource>
-									<directory>src/it/resources</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>3.0.0-M4</version>
+				<configuration>
+					<classesDirectory>${project.build.outputDirectory}</classesDirectory>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>
-- 
cgit 1.2.3-korg