1710 Rebase - Second Attempt

[so.git] / asdc-controller / pom.xml

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