Migration to use MD-SAL Project

Change-Id: I41ed57fe7bb78b75881b87409a81ac43695a80d6
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/features-packetcable-policy/pom.xml b/features-packetcable-policy/pom.xml
index 11cb64debccdba556da17251ee346c0c55f60695..7c27cb4227270fdac3824bcf21cc9cae0d19cfad 100644 (file)
--- a/features-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/pom.xml
@@ -24,6 +24,7 @@
         <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
         <restconf.version>1.3.0-SNAPSHOT</restconf.version>
         <feature.test.version>1.6.0-SNAPSHOT</feature.test.version>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     </properties>
     <dependencies>
         <dependency>
@@ -42,6 +43,14 @@
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.mdsal.model</groupId>
+          <artifactId>features-mdsal-model</artifactId>
+          <version>${mdsal.model.version}</version>
+          <classifier>features</classifier>
+          <type>xml</type>
+          <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>features-restconf</artifactId>

diff --git a/features-packetcable-policy/src/main/features/features.xml b/features-packetcable-policy/src/main/features/features.xml
index 0d0c2bbb2eadeea8d6ac5ce62add77f7ed06f298..4ef3e4e5d378013b0da1385dc17f47e9acaef04a 100644 (file)
--- a/features-packetcable-policy/src/main/features/features.xml
+++ b/features-packetcable-policy/src/main/features/features.xml
@@ -9,26 +9,26 @@
 <features name="odl-packetcable-${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.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
     <feature name='odl-packetcable-policy-server-all' version='${project.version}'
         description='OpenDaylight :: packetcable :: policy :: All'>
         <feature version='${project.version}'>odl-packetcable-policy-server</feature>
     </feature>
     <feature name='odl-packetcable-policy-model' version='${project.version}'
         description='OpenDaylight :: packetcable :: policy :: Model'>
-        <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:org.opendaylight.packetcable/packetcable-policy-model/${project.version}</bundle>
+        <feature version='${yangtools.version}'>odl-mdsal-models</feature>
+        <bundle>mvn:org.opendaylight.packetcable/packetcable-policy-model/{{VERSION}}</bundle>
     </feature>
     <feature name='odl-packetcable-policy-server' version='${project.version}'
         description='OpenDaylight :: packetcable :: policy :: Provider'>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
         <feature version='${project.version}'>odl-packetcable-policy-model</feature>
-        <bundle>mvn:org.opendaylight.packetcable/packetcable-policy-server/${project.version}</bundle>
-        <bundle>mvn:org.opendaylight.packetcable/packetcable-driver/${project.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/80-packetcable.xml">mvn:org.opendaylight.packetcable/packetcable-policy-server/${project.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.packetcable/packetcable-policy-server/{{VERSION}}</bundle>
+        <bundle>mvn:org.opendaylight.packetcable/packetcable-driver/{{VERSION}}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/80-packetcable.xml">mvn:org.opendaylight.packetcable/packetcable-policy-server/{{VERSION}}/xml/config</configfile>
     </feature>
-</features>
\ No newline at end of file
+</features>

diff --git a/packetcable-policy-model/pom.xml b/packetcable-policy-model/pom.xml
index c30ce93b68b72b18a8f3dd4f321fcd31f86b921d..03c9b58460b4af8856ab418b0f457b855e172f45 100644 (file)
--- a/packetcable-policy-model/pom.xml
+++ b/packetcable-policy-model/pom.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.yangtools</groupId>
+        <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
         <version>0.8.0-SNAPSHOT</version>
         <relativePath />
@@ -13,17 +13,30 @@
     <name>${project.artifactId}</name>
     <version>1.3.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
+
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>mdsal-model-artifacts</artifactId>
+            <version>0.8.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
index b14e5e14bf27d7d82c8f685c09a267cde6a0064b..8c100ea8e749a7371907ec9dd50ee8cb395f6889 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <!-- FIXME: Do not use sal-parent, use odlparent:odlparent or mdsal:binding-parent intstead. -->
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
@@ -27,6 +28,26 @@
             <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
         </snapshotRepository>
     </distributionManagement>
+
+    <dependencyManagement>
+      <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-artifacts</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>mdsal-model-artifacts</artifactId>
+            <version>0.8.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+      </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>packetcable-driver</module>
         <!-- New modules for the new Arris API -->
@@ -55,11 +76,11 @@
             <version>${openflowplugin.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
         <dependency>
@@ -67,7 +88,7 @@
             <artifactId>model-inventory</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>opendaylight-l2-types</artifactId>
         </dependency>
         <dependency>