From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Sun, 29 Jul 2018 16:13:45 +0300
Subject: re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>
---
 asdctool/pom.xml | 95 ++++++++++++++++----------------------------------------
 1 file changed, 27 insertions(+), 68 deletions(-)

(limited to 'asdctool/pom.xml')

diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index ce64b7fc1b..09e2e186a8 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -77,20 +77,20 @@
 					<groupId>org.onap.sdc.common</groupId>
 					<artifactId>onap-common-lib</artifactId>
 				</exclusion>
-				
+
 				<exclusion>
 					<groupId>com.att.nsa</groupId>
 					<artifactId>cambriaClient</artifactId>
 				</exclusion>
 				<exclusion>
-			       <groupId>com.att.nsa</groupId>
-			       <artifactId>dmaapClient</artifactId>
-			 	</exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
 				<exclusion>
 					<artifactId>slf4j-log4j12</artifactId>
 					<groupId>org.slf4j</groupId>
 				</exclusion>
-				
+
 			</exclusions>
 
 			<scope>compile</scope>
@@ -107,9 +107,9 @@
 					<artifactId>cambriaClient</artifactId>
 				</exclusion>
 				<exclusion>
-			       <groupId>com.att.nsa</groupId>
-			       <artifactId>dmaapClient</artifactId>
-			 	</exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
 				<exclusion>
 					<artifactId>slf4j-log4j12</artifactId>
 					<groupId>org.slf4j</groupId>
@@ -118,46 +118,6 @@
 		</dependency>
 
 
-		<!--Artifact Generator-->
-		<dependency>
-			<groupId>org.onap.sdc.common</groupId>
-			<artifactId>onap-sdc-artifact-generator-api</artifactId>
-			<version>${artifact-generator-api.version}</version>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>junit</groupId>
-					<artifactId>junit</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.onap.sdc.common</groupId>
-			<artifactId>onap-sdc-artifact-generator-core</artifactId>
-			<version>${artifact-generator-core.version}</version>
-			<scope>compile</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>junit</groupId>
-					<artifactId>junit</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.onap.sdc.common</groupId>
-			<artifactId>onap-common-lib</artifactId>
-			<version>${dox-common-lib.version}</version>
-			<type>pom</type>
-			<exclusions>
-				<exclusion>
-					<groupId>junit</groupId>
-					<artifactId>junit</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 
 		<!-- ASDC dependencies end -->
 		<dependency>
@@ -354,12 +314,6 @@
 			<version>${commons-codec}</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -368,11 +322,11 @@
 			<scope>compile</scope>
 		</dependency>
 
+		<!-- Explicitly specified in order to override older version included by epsdk-fw -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.annotations.version}</version>
-			<scope>compile</scope>
+			<version>${jackson-annotations.version}</version>
 		</dependency>
 
 		<dependency>
@@ -493,15 +447,15 @@
 		</dependency>
 
 		<!-- CASSANDRA END -->
-		
+
 		<!-- OPEN CSV -->
-		 <dependency>
-     		<groupId>com.opencsv</groupId>
-     		<artifactId>opencsv</artifactId>
-     		<version>4.0</version>
-     		<scope>compile</scope>
-  		</dependency>
-		
+		<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>
@@ -516,7 +470,7 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<!-- Temporary, till building the populate task which adding all components 
+		<!-- Temporary, till building the populate task which adding all components
 			to cache. We will use Serialization Utils. -->
 		<dependency>
 			<groupId>de.ruedigermoeller</groupId>
@@ -545,7 +499,12 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- testing end -->
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- testing end -->
 
 	</dependencies>
 
@@ -627,7 +586,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
 				<version>3.1.0</version>
-    			<executions>
+				<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
@@ -809,4 +768,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
+</project>
\ No newline at end of file
-- 
cgit 1.2.3-korg