From: Dan Timoney <dt5972@att.com>
Date: Fri, 24 Aug 2018 19:27:59 +0000 (+0000)
Subject: Merge "Fix packaging of netbox-client"
X-Git-Tag: 0.3.0~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d7233c8b319c44728ffcb72c7a7576fa6a3ef372;hp=e2b2138f05e9eaf3eb89f9a65859433cf79b9960;p=ccsdk%2Fsli%2Fadaptors.git

Merge "Fix packaging of netbox-client"
---

diff --git a/aai-service/provider/src/main/resources/aai-path.properties b/aai-service/provider/src/main/resources/aai-path.properties
index 0a2e4cc1..e4b36dd9 100755
--- a/aai-service/provider/src/main/resources/aai-path.properties
+++ b/aai-service/provider/src/main/resources/aai-path.properties
@@ -318,4 +318,6 @@ vpn-binding = /aai/v13/network/vpn-bindings/vpn-binding/{vpn-id}
 vpn-binding|route-targets = /aai/v13/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets
 vpn-binding|route-target = /aai/v13/network/vpn-bindings/vpn-binding/{vpn-id}/route-targets/route-target/{global-route-target}/{route-target-role}
 zones = /aai/v13/network/zones
-zone = /aai/v13/network/zones/zone/{zone-id}
\ No newline at end of file
+zone = /aai/v13/network/zones/zone/{zone-id}
+esr-thirdparty-sdnc = /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{thirdparty-sdnc-id}
+esr-thirdparty-sdnc-list = /aai/v11/external-system/esr-thirdparty-sdnc-list
\ No newline at end of file
diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
index d90b3976..bdcb052a 100644
--- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml
@@ -35,7 +35,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <!--   <dependencies>
+  <!-- <dependencies>
            <dependency>
                <groupId>org.onap.ccsdk.sli.core</groupId>
                <artifactId>ccsdk-sli</artifactId>
@@ -48,5 +48,5 @@
                <version>${project.version}</version>
            </dependency>
        </dependencies>
-       -->
+  -->
 </project>
diff --git a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
index abdcb5e2..cca279cd 100644
--- a/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
+++ b/saltstack-adapter/saltstack-adapter-features/src/main/resources/features.xml
@@ -24,25 +24,21 @@
   -->
 
 
-<features xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          name="ccsdk-saltstack-adapter-${project.version}"
-          xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="ccsdk-saltstack-adapter-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
-    <repository>
-        mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features
-    </repository>
+    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
     <feature name='ccsdk-saltstack-adapter'
              description="ccsdk-saltstack-adapter" version='${project.version}'>
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <feature>sdnc-sli</feature>
-        <bundle dependency="true">
-            mvn:org.onap.appc/appc-common/${project.version}
-        </bundle>
-        <bundle>
-            mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}
-        </bundle>
+        <bundle dependency="true">mvn:org.apache.sshd/sshd-core/0.12.0</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-common/1.3.0</bundle>
+        <bundle dependency="true">mvn:org.onap.appc/appc-ssh-adapter-api/1.3.0</bundle>
+        <bundle dependency="true">mvn:org.apache.commons/commons-io/1.3.2</bundle>
+        <bundle>mvn:org.onap.ccsdk.sli.adaptors/saltstack-adapter-provider/${project.version}</bundle>
     </feature>
 
 </features>
diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml
index 81e9ba9e..4c7646d6 100644
--- a/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -43,13 +43,25 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
 
         <!-- Needed to run SSH -->
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
             <version>0.12.0</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -66,19 +78,6 @@
         </dependency>
 
         <!-- Needed to run test cases -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-common</artifactId>
-            <version>2.9.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
-            <version>1.9.13</version>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -89,7 +88,6 @@
         <dependency>
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -97,11 +95,7 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
@@ -111,32 +105,12 @@
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
         </dependency>
 
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>