From 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 Mon Sep 17 00:00:00 2001
From: Arthur Martella <amartell@research.att.com>
Date: Fri, 8 Sep 2017 13:27:46 -0400
Subject: 1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
---
 asdc-controller/pom.xml | 57 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 15 deletions(-)

(limited to 'asdc-controller/pom.xml')

diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index 9560092fd2..fa4538c19c 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -29,12 +29,6 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-             <groupId>org.evosuite</groupId>
-             <artifactId>evosuite-standalone-runtime</artifactId>
-             <version>${evosuiteVersion}</version>
-             <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
@@ -71,19 +65,52 @@
 				<version>3.1.0</version>
 				<scope>test</scope>
 		</dependency>
-
+		
+	<!-- 	<dependency>
+  				<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+  				<artifactId>sdc-distribution-client</artifactId>
+  				<version>1.1.16</version>
+  				<exclusions>
+       		 		<exclusion>  
+	         	 		<groupId>org.slf4j</groupId>
+	         	 		<artifactId>slf4j-log4j12</artifactId>
+       		 		</exclusion>
+    	  		</exclusions> 
+		</dependency>  -->
+		
 		<dependency>
-			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
-            <artifactId>sdc-distribution-client</artifactId>
-            <version>1.1.6-SNAPSHOT</version>
-			<exclusions>
-       		 <exclusion>  <!-- declare the exclusion here -->
-	         	 <groupId>org.slf4j</groupId>
-	         	 <artifactId>slf4j-log4j12</artifactId>
-       		 </exclusion>
+				<groupId>org.apache.httpcomponents</groupId>
+				<artifactId>httpclient</artifactId>
+				<version>4.4.1</version>
+				<scope>compile</scope>
+				<exclusions>
+       		 		<exclusion>  
+	         	 		<groupId>org.apache.httpcomponents</groupId>
+	         	 		<artifactId>httpclient</artifactId>
+       		 		</exclusion>
+    	  		</exclusions>
+		</dependency>
+		
+	 	<dependency>
+  			<groupId>org.openecomp.sdc.sdc-distribution-client</groupId>
+  			<artifactId>sdc-distribution-client</artifactId>
+ 			 <version>1.1.32-SNAPSHOT</version>
+ 			<exclusions>
+       		 	<exclusion>  
+	         	 	<groupId>org.slf4j</groupId>
+	         	 	<artifactId>slf4j-log4j12</artifactId>
+       		 	</exclusion>
     	  </exclusions>
 		</dependency>
 
+
+		<dependency>
+  			<groupId>org.openecomp.sdc.sdc-tosca</groupId>
+  			<artifactId>sdc-tosca</artifactId>
+			<version>1.1.32-SNAPSHOT</version>
+		</dependency> 
+		
+
 		<dependency>
 		    <groupId>org.apache.httpcomponents</groupId>
 		    <artifactId>httpmime</artifactId>
-- 
cgit 1.2.3-korg