Update sli/northbound to ODL Oxygen

Updated features poms to get clean compile with ODL Oxygen-based parent
poms.

Change-Id: I812ad71ff07117baf62b6111011ce52229ebe6e0
Issue-ID: CCSDK-282
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml
index c4c7b7f..d26c948 100644 (file)
--- a/asdcApi/features/ccsdk-asdcApi/pom.xml
+++ b/asdcApi/features/ccsdk-asdcApi/pom.xml
@@ -16,15 +16,28 @@
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
-
+    
+       <dependencyManagement>
+               <dependencies>
+                    <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>

diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml
index d52c702..1098160 100755 (executable)
--- a/asdcApi/provider/pom.xml
+++ b/asdcApi/provider/pom.xml
@@ -53,11 +53,7 @@
             <artifactId>sal-test-model</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-rest-connector</artifactId>
-            <scope>test</scope>
-        </dependency>
+
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml
index bbe3e41..9ed0ac7 100644 (file)
--- a/dataChange/features/ccsdk-dataChange/pom.xml
+++ b/dataChange/features/ccsdk-dataChange/pom.xml
@@ -17,14 +17,27 @@
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
-
+       <dependencyManagement>
+               <dependencies>
+                    <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>

diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml
index 59d58ac..29a8324 100755 (executable)
--- a/dataChange/provider/pom.xml
+++ b/dataChange/provider/pom.xml
@@ -46,11 +46,7 @@
             <artifactId>sal-test-model</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-rest-connector</artifactId>
-            <scope>test</scope>
-        </dependency>
+
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml
index 9a0e080..5ea2887 100644 (file)
--- a/lcm/features/ccsdk-lcm/pom.xml
+++ b/lcm/features/ccsdk-lcm/pom.xml
@@ -17,14 +17,27 @@
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
 
-
+       <dependencyManagement>
+               <dependencies>
+                    <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
+
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>ccsdk-sli</artifactId>