Sync Integ to Master

[sdc.git] / asdctool / pom.xml

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 1950a3b..740f8f4 100644 (file)
--- 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>