From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Sun, 4 Mar 2018 14:53:33 +0200
Subject: Sync Integ to Master

Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
---
 asdctool/pom.xml | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'asdctool/pom.xml')

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 1950a3b048..740f8f44b4 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -77,6 +77,20 @@
 					<groupId>org.openecomp.sdc.common</groupId>
 					<artifactId>openecomp-common-lib</artifactId>
 				</exclusion>
+				
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>cambriaClient</artifactId>
+				</exclusion>
+				<exclusion>
+			       <groupId>com.att.nsa</groupId>
+			       <artifactId>dmaapClient</artifactId>
+			 	</exclusion>
+				<exclusion>
+					<artifactId>slf4j-log4j12</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+				
 			</exclusions>
 
 			<scope>compile</scope>
@@ -92,7 +106,10 @@
 					<groupId>com.att.nsa</groupId>
 					<artifactId>cambriaClient</artifactId>
 				</exclusion>
-
+				<exclusion>
+			       <groupId>com.att.nsa</groupId>
+			       <artifactId>dmaapClient</artifactId>
+			 	</exclusion>
 				<exclusion>
 					<artifactId>slf4j-log4j12</artifactId>
 					<groupId>org.slf4j</groupId>
@@ -476,6 +493,15 @@
 		</dependency>
 
 		<!-- CASSANDRA END -->
+		
+		<!-- OPEN CSV -->
+		 <dependency>
+     		<groupId>com.opencsv</groupId>
+     		<artifactId>opencsv</artifactId>
+     		<version>4.0</version>
+     		<scope>compile</scope>
+  		</dependency>
+		
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>com.springsource.org.apache.poi</artifactId>
@@ -517,7 +543,6 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>${mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- testing end -->
@@ -556,12 +581,11 @@
 				</executions>
 			</plugin>
 
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 				<version>3.1.0</version>
-				<executions>
+    			<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
@@ -753,7 +777,7 @@
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>0.23.0</version>
+						<version>${fabric8.version}</version>
 
 						<configuration>
 							<verbose>true</verbose>
-- 
cgit 1.2.3-korg