Migration to use MD-SAL Project

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

diff --git a/api/pom.xml b/api/pom.xml
index 5de3a927fb8272ffe8e6c43b47dee498de65e670..7f3d52b3810aaeeec82152bf22647b97d8330c38 100755 (executable)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
 <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">
   <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
+    <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <relativePath/>
@@ -20,17 +20,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.0.1-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-yang-types-20130715</artifactId>
     </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-topology</artifactId>
     </dependency>
   </dependencies>

diff --git a/features/pom.xml b/features/pom.xml
index f510d1e94ed3333d1f459ee487d4748ad26678e6..a7fd924a501a40753d018a1f0659e12f41549b9c 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -27,6 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <dlux.version>0.3.0-SNAPSHOT</dlux.version>
     <ovsdb.version>1.2.0-SNAPSHOT</ovsdb.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
   <dependencyManagement>
@@ -57,6 +58,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <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.controller</groupId>
       <artifactId>features-mdsal</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index cd6a2e664ccd96af2b4d9603d1beb1e5b0662945..41026ead2607c4be5339b25680df257dcf8dba29 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -17,7 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
 
   <feature name='odl-unimgr-api' version='${project.version}' description='OpenDaylight :: VCPE :: api'>
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <bundle>mvn:org.opendaylight.unimgr/unimgr-api/${project.version}</bundle>
   </feature>