Migration to use MD-SAL Project

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

diff --git a/alto-hosttracker/implementation/pom.xml b/alto-hosttracker/implementation/pom.xml
index 52a58bdafefc931ddfd49e2d94784af92263d211..ef0c91c9b44a0fb77d51cabb885d5adea5551097 100644 (file)
--- a/alto-hosttracker/implementation/pom.xml
+++ b/alto-hosttracker/implementation/pom.xml
@@ -65,7 +65,7 @@
             <version>0.4.0-SNAPSHOT</version>
           </dependency>
           <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
             <type>jar</type>
@@ -97,7 +97,7 @@
       <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
       <version>${yangtools.version}</version>
     </dependency>
@@ -125,7 +125,7 @@
       <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
       <version>${ietf.topology.version}</version>
     </dependency>

diff --git a/alto-hosttracker/model/pom.xml b/alto-hosttracker/model/pom.xml
index 065011213286b80f147b3f593eff19cc9edf605a..91211f45f9fff9fb105d8914c35e18c1a90f6a11 100644 (file)
--- a/alto-hosttracker/model/pom.xml
+++ b/alto-hosttracker/model/pom.xml
@@ -55,7 +55,7 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
             <type>jar</type>

diff --git a/alto-model/pom.xml b/alto-model/pom.xml
index 34052607229f7ff2f06372111a9feb0281ba9d9d..7733a308ac5b6aaa7bbacab84025384b404defce 100644 (file)
--- a/alto-model/pom.xml
+++ b/alto-model/pom.xml
@@ -36,7 +36,7 @@
             <version>${config.version}</version>
           </dependency>
           <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
             <type>jar</type>
@@ -82,11 +82,11 @@
       <artifactId>guava</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-yang-types-20130715</artifactId>
     </dependency>
   </dependencies>

diff --git a/alto-provider/pom.xml b/alto-provider/pom.xml
index 1596adff90537940f5d449ac2f5aaa96a6dd6056..a42da1991c19b1a89095345c571b5bef4668404f 100644 (file)
--- a/alto-provider/pom.xml
+++ b/alto-provider/pom.xml
@@ -92,7 +92,7 @@
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
             <version>${ietf.topology.version}</version>
         </dependency>
@@ -133,7 +133,7 @@
             <version>${config.version}</version>
           </dependency>
           <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
             <type>jar</type>

diff --git a/alto-services/provider/simple-alto/pom.xml b/alto-services/provider/simple-alto/pom.xml
index 1d7c79798133b47e04dd61f6cac14d422cce6c64..c6b6faacb8524a174dd211f5e4a5aa462b0a92b6 100644 (file)
--- a/alto-services/provider/simple-alto/pom.xml
+++ b/alto-services/provider/simple-alto/pom.xml
@@ -14,6 +14,18 @@
   <version>0.2.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>${project.groupId}</groupId>
@@ -62,7 +74,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
     </dependency>
 

diff --git a/features/pom.xml b/features/pom.xml
index 3b9b55ddcb63cd1938f3619e9d109feacae142ae..39db46cee58805642e09a93555e95226624d626f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -45,6 +45,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <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.apache.karaf.features</groupId>
       <artifactId>standard</artifactId>
@@ -183,7 +192,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
 
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
       <version>${ietf.topology.version}</version>
     </dependency>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 06caf98faebbf1deeeaadf3a28e008efde6363df..c8f19889a291b0402744b49513cd7d4d6985edbe 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <features name="odl-alto-${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.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
@@ -23,8 +23,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </feature>
 
   <feature name='odl-alto-model' version='${project.version}' description='OpenDaylight :: alto :: Model '>
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+    <feature version='${yangtools.version}'>odl-mdsal-binding-base</feature>
     <bundle>mvn:org.opendaylight.alto/alto-model/${project.version}</bundle>
   </feature>
 

diff --git a/pom.xml b/pom.xml
index 9525443eb929a29086af5e868641aa7737788bca..ba3f351b2b30d5bc7e4b5b423002ea9e36d6ed91 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     <sal.version>0.10.0-SNAPSHOT</sal.version>
     <war.version>${karaf.version}</war.version>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
 
@@ -80,14 +81,18 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-inet-types</artifactId>
-        <version>${ietf.model.version}</version>
+        <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.yangtools.model</groupId>
-        <artifactId>ietf-yang-types-20130715</artifactId>
-        <version>${ietf.yang.types.version}</version>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>${mdsal.model.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>