Code Review / vpnservice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 1896fbc)
Migration to use MD-SAL Project 48/26348/5
authorTony Tkacik <ttkacik@cisco.com>
Wed, 2 Sep 2015 14:13:29 +0000 (16:13 +0200)
committerTony Tkacik <ttkacik@cisco.com>
Mon, 21 Sep 2015 10:25:06 +0000 (12:25 +0200)
Change-Id: Ic7185f1fe85b53fe00b29c1023762d704cd3e51a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
commons/binding-parent/pom.xml patch | blob | history
commons/config-parent/pom.xml patch | blob | history
features/pom.xml patch | blob | history
features/src/main/features/features.xml patch | blob | history
fibmanager/fibmanager-api/pom.xml patch | blob | history
idmanager/idmanager-api/pom.xml patch | blob | history
interfacemgr/interfacemgr-api/pom.xml patch | blob | history
interfacemgr/interfacemgr-impl/pom.xml patch | blob | history
model-bgp/pom.xml patch | blob | history
nexthopmgr/nexthopmgr-api/pom.xml patch | blob | history
vpnmanager/vpnmanager-api/pom.xml patch | blob | history

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index e33083612d89dbded7c3cc664f07caa2af22f731..e2135c278f88d1cef149ee2c050920e207e04702 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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/>
@@ -28,7 +28,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <iana.if.type.version>2014.05.08.8-SNAPSHOT</iana.if.type.version>
     <yang.ext.version>2013.09.07.8-SNAPSHOT</yang.ext.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
     <vpns.mdsalutil.version>0.2.0-SNAPSHOT</vpns.mdsalutil.version>
     <model.bgp.version>2013.07.15.8-SNAPSHOT</model.bgp.version>
   </properties>
diff --git a/commons/config-parent/pom.xml b/commons/config-parent/pom.xml
index 22e0307dc0c61655466d45bdd6857fd16f0c3c93..0416c9d43023c71d21c2a926e172c5a7a385edd4 100644 (file)
--- a/commons/config-parent/pom.xml
+++ b/commons/config-parent/pom.xml
@@ -24,18 +24,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <!-- ODL -->
     <vpnservices.version>0.2.0-SNAPSHOT</vpnservices.version>
-    <ietf.inet.types.version>2010.09.24.8-SNAPSHOT</ietf.inet.types.version>
-    <ietf.yang.types.version>2010.09.24.8-SNAPSHOT</ietf.yang.types.version>
-    <ietf.interfaces.version>2014.05.08.8-SNAPSHOT</ietf.interfaces.version>
-    <iana.if.type.version>2014.05.08.8-SNAPSHOT</iana.if.type.version>
-    <yang.ext.version>2013.09.07.8-SNAPSHOT</yang.ext.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
     <vpns.mdsalutil.version>0.2.0-SNAPSHOT</vpns.mdsalutil.version>
     <model.bgp.version>2013.07.15.8-SNAPSHOT</model.bgp.version>
     <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
   </properties>
 
+  <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>
+
   <dependencies>
     <!-- Testing Dependencies -->
     <dependency>
diff --git a/features/pom.xml b/features/pom.xml
index 1eb1862914310fee9a530bda40f53f4b833322c2..26c591ef42d2d9e946064eefe1a1e72a34dad78f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -25,6 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
     <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <vpnservices.version>0.2.0-SNAPSHOT</vpnservices.version>
     <mdsalutil.version>${vpnservices.version}</mdsalutil.version>
     <vpnmanager.version>${vpnservices.version}</vpnmanager.version>
@@ -69,6 +70,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.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 7b5d8d2d031221fa3b284408adf641fdca4cf8e0..0948fc813dd01413cfb687459b79b67b7b71daca 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -12,11 +12,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   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.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${restconf.version}/xml/features</repository>
   <feature name='odl-vpnservice-api' version='${project.version}' description='OpenDaylight :: vpnservice :: api '>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
     <bundle>mvn:org.opendaylight.vpnservice/model-bgp/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/idmanager-api/${idmanager.version}</bundle>
diff --git a/fibmanager/fibmanager-api/pom.xml b/fibmanager/fibmanager-api/pom.xml
index 32548ccd05362d398f5f9c10e11d9781a7db1127..9f4e754df42ade8fa3a53969a58f58db13cff46b 100644 (file)
--- a/fibmanager/fibmanager-api/pom.xml
+++ b/fibmanager/fibmanager-api/pom.xml
@@ -22,39 +22,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
diff --git a/idmanager/idmanager-api/pom.xml b/idmanager/idmanager-api/pom.xml
index 54040f4bbcd2e2bbebc0f9b40deb54e98385d09e..7e14a28fc5b42f16a3b7eec3860f66fd2322987f 100644 (file)
--- a/idmanager/idmanager-api/pom.xml
+++ b/idmanager/idmanager-api/pom.xml
@@ -22,14 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/interfacemgr/interfacemgr-api/pom.xml b/interfacemgr/interfacemgr-api/pom.xml
index 56776abb55440862482ce441aa3328c870c900c7..8c24456065bc678d450bcd22c58f0b8014d73b8c 100644 (file)
--- a/interfacemgr/interfacemgr-api/pom.xml
+++ b/interfacemgr/interfacemgr-api/pom.xml
@@ -22,44 +22,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
-      <version>${yang.ext.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
@@ -67,4 +56,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${vpns.mdsalutil.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/interfacemgr/interfacemgr-impl/pom.xml b/interfacemgr/interfacemgr-impl/pom.xml
index da429c34d9107161284c72df55b78c5b4b64ed78..32d1ab6dc18f455c1a8ea99a16e797af4f5a2df7 100644 (file)
--- a/interfacemgr/interfacemgr-impl/pom.xml
+++ b/interfacemgr/interfacemgr-impl/pom.xml
@@ -32,9 +32,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${openflowplugin.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
diff --git a/model-bgp/pom.xml b/model-bgp/pom.xml
index 714b9d073f3f63893bd260dc15aba3b54a7d37d5..b8d440005ea70583a0a528868971a179c550a1f0 100644 (file)
--- a/model-bgp/pom.xml
+++ b/model-bgp/pom.xml
@@ -26,24 +26,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>${ietf.inet.types.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>${ietf.yang.types.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/nexthopmgr/nexthopmgr-api/pom.xml b/nexthopmgr/nexthopmgr-api/pom.xml
index bca8ff0a533141073c42f99b202a9c5ad332da42..7f037d192d4cfa42ca9fe756e014c4bc4a158e6a 100644 (file)
--- a/nexthopmgr/nexthopmgr-api/pom.xml
+++ b/nexthopmgr/nexthopmgr-api/pom.xml
@@ -22,44 +22,37 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
-      <version>${yang.ext.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/vpnmanager/vpnmanager-api/pom.xml b/vpnmanager/vpnmanager-api/pom.xml
index f65919233efb730f1df8c4bd21968bb4bbc08301..81ee623c86895d17d0c1e0399697f60c08633efc 100644 (file)
--- a/vpnmanager/vpnmanager-api/pom.xml
+++ b/vpnmanager/vpnmanager-api/pom.xml
@@ -22,39 +22,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
-      <version>${yang.ext.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types</artifactId>
-      <version>${ietf.inet.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
-      <version>${ietf.yang.types.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
-      <version>${ietf.interfaces.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>iana-if-type-2014-05-08</artifactId>
-      <version>${iana.if.type.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>