X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=saltstack-adapter%2Fsaltstack-adapter-provider%2Fpom.xml;h=f5ad24a0b40c3435d3afc3b22cffaaa32712d5a2;hb=078c3a24b4cb1c77be446c86d68a6f81029ee1ef;hp=4be5e9fb7dee86db1b2c8db1c93bd7a2a9ba53bd;hpb=e6b9133f88c3b8da88c125a5e63c2caad66a9fd7;p=ccsdk%2Fsli%2Fadaptors.git

diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml
index 4be5e9fb..f5ad24a0 100644
--- a/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -16,13 +16,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.3.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>saltstack-adapter-provider</artifactId>
-    <version>0.4.2-SNAPSHOT</version>
+    <version>0.5.4</version>
     <packaging>bundle</packaging>
     <name>ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId}
     </name>
@@ -66,37 +66,22 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
 
         <!-- Needed to run SSH -->
+        <!-- VERSION CONFLICT !!!!! -->
+        <!-- OpenDaylight Fluorine comes with version 1.7.0 installed, which is not compatible -->
+        <!-- Code must be updated to use version 1.7.0 before this can be safely installed -->
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>0.12.0</version>
+            <version>1.7.0</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.onap.appc</groupId>-->
-            <!--<artifactId>appc-common</artifactId>-->
-            <!--<version>1.3.0</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.onap.appc</groupId>-->
-            <!--<artifactId>appc-ssh-adapter-api</artifactId>-->
-            <!--<version>1.3.0</version>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-
         <!-- Needed to run test cases -->
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-io</artifactId>
-            <version>1.3.2</version>
         </dependency>
 
         <dependency>
@@ -113,11 +98,13 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-        </dependency>
+            <scope>provided</scope> 
+       </dependency>
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>