Migration to use MD-SAL Project

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

diff --git a/bgp/bmp-api/pom.xml b/bgp/bmp-api/pom.xml
index 763f326ed1fe3fd92913facb13191ea2461d9d6d..0f29233e30ccb39440729adeb47b09bcc9b6a3f5 100644 (file)
--- a/bgp/bmp-api/pom.xml
+++ b/bgp/bmp-api/pom.xml
@@ -31,11 +31,11 @@
 
     <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>
@@ -47,7 +47,7 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/bmp-impl/pom.xml b/bgp/bmp-impl/pom.xml
index 9dc8232cc542efd486175367682ab04f407b9f80..70ebfe596103b1afe528603f4668d567f9163be0 100644 (file)
--- a/bgp/bmp-impl/pom.xml
+++ b/bgp/bmp-impl/pom.xml
@@ -73,7 +73,7 @@
             <artifactId>tcpmd5-netty</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -101,12 +101,12 @@
             <artifactId>sal-core-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-data-codec</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-codec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -153,11 +153,11 @@
             <artifactId>concepts</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.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/bmp-spi/pom.xml b/bgp/bmp-spi/pom.xml
index 2c833cb4c3b174a6937d2237ef58922a7a0636dd..159716a6d95333a0a394a4be21a84c632e187e04 100644 (file)
--- a/bgp/bmp-spi/pom.xml
+++ b/bgp/bmp-spi/pom.xml
@@ -63,11 +63,11 @@
             <artifactId>concepts</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.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
@@ -87,7 +87,7 @@
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index e904a303944a8e28e8bb9becaefda4b786e353b8..f00009a38fd1d4076d1998b43197ef77f0dd53b2 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -50,7 +50,7 @@
                    be here, but the plugin should bring it in.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -68,7 +68,7 @@
                     discovered by the plugin.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/flowspec/pom.xml b/bgp/flowspec/pom.xml
index 5d9399cc19d528b62ed00c8770d855d5b86c705d..c4feaae980069cb3ce7d1e5f27770e05db3345bb 100644 (file)
--- a/bgp/flowspec/pom.xml
+++ b/bgp/flowspec/pom.xml
@@ -75,7 +75,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -87,7 +87,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/inet/pom.xml b/bgp/inet/pom.xml
index ee596babb85b80eb018131814144a162573729a3..f0f7d9b89d6118f68d4884e55ac95dc26f83e9ba 100644 (file)
--- a/bgp/inet/pom.xml
+++ b/bgp/inet/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -55,7 +55,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/linkstate/pom.xml b/bgp/linkstate/pom.xml
index 2a17006a4832cddb9b4f2ce7b7cde3e306097d09..f9811919f825641ffd4a9c65352af7a49641868a 100644 (file)
--- a/bgp/linkstate/pom.xml
+++ b/bgp/linkstate/pom.xml
@@ -75,7 +75,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -87,7 +87,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
          <dependency>

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index f2d4c7f3d9b85622e3b7e8655a1ff1634c8049b9..19bdff02f830347ec1371a884201776bbbc8547b 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -54,7 +54,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -67,7 +67,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/parser-impl/pom.xml b/bgp/parser-impl/pom.xml
index 5391ad4e737d8bbb0b3269aa5b3e4ca5523876b3..4b8846b4f20a72e5e95fb39280295df41225a3e0 100644 (file)
--- a/bgp/parser-impl/pom.xml
+++ b/bgp/parser-impl/pom.xml
@@ -70,11 +70,11 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/parser-mock/pom.xml b/bgp/parser-mock/pom.xml
index 568eab109aae49b7094d5d2237f3de738e8982f7..5ef14f1fab24d8df630bffebf214fb42d60afe49 100644 (file)
--- a/bgp/parser-mock/pom.xml
+++ b/bgp/parser-mock/pom.xml
@@ -49,11 +49,11 @@
             <artifactId>netty-buffer</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/bgp/parser-spi/pom.xml b/bgp/parser-spi/pom.xml
index edce8227d8a8826a785a3b2dcd5141a4813945a6..d32080bcba6d07ca01e50cffb525c068e5a9f226 100644 (file)
--- a/bgp/parser-spi/pom.xml
+++ b/bgp/parser-spi/pom.xml
@@ -63,7 +63,7 @@
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -75,7 +75,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 

diff --git a/bgp/rib-api/pom.xml b/bgp/rib-api/pom.xml
index 6cfbf7b0210da0a57a7e41a2d94b180b40afcf09..b2b8f30222046527312ab2e7c97a61df99b3b94d 100644 (file)
--- a/bgp/rib-api/pom.xml
+++ b/bgp/rib-api/pom.xml
@@ -45,7 +45,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -61,7 +61,7 @@
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 5df4ce00da137e9ee93474ad5ea68db71eb380f4..68781453560550746e8a338f71a7cbaaf998a3c3 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -105,7 +105,7 @@
             <artifactId>protocol-framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -129,7 +129,7 @@
             <artifactId>yang-data-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 
@@ -150,8 +150,8 @@
             <artifactId>sal-binding-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/bgp/rib-mock/pom.xml b/bgp/rib-mock/pom.xml
index 71809009e7aa99ce0e1c905c2c96c951eeaeebc8..3684bb8d5fe5fb38be7674d960edbcb92e2ca7d7 100644 (file)
--- a/bgp/rib-mock/pom.xml
+++ b/bgp/rib-mock/pom.xml
@@ -54,11 +54,11 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index dea4617b96e9fa068e33aca662221af498c00524..2c812ab4e7ae851e3ab77f6635a388507c93c2fa 100644 (file)
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -53,11 +53,11 @@
             <artifactId>bgp-inet</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</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -77,8 +77,8 @@
             <artifactId>sal-core-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/bgp/testtool/pom.xml b/bgp/testtool/pom.xml
index 477e83215ff7ef4fc8197ea8290de7b143a98ca4..2ed2986fcae503c5ede6c527ab87587bdaff7723 100644 (file)
--- a/bgp/testtool/pom.xml
+++ b/bgp/testtool/pom.xml
@@ -63,11 +63,11 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 

diff --git a/bgp/topology-provider/pom.xml b/bgp/topology-provider/pom.xml
index 4a28de8c1ca08d39d33a64fcca6e0e37f6ffdee5..1a1c67a4df7a4db3862e3352ea89da118127ec77 100644 (file)
--- a/bgp/topology-provider/pom.xml
+++ b/bgp/topology-provider/pom.xml
@@ -77,7 +77,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -102,27 +102,27 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-ted</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology-isis</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology-ospf</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology-l3-unicast-igp</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 

diff --git a/bgp/util/pom.xml b/bgp/util/pom.xml
index 606981979c24612d32b985702e973b9b46331859..fb1c5b0a3a4a1fc2da4b2ba1e8faadc773f74e52 100644 (file)
--- a/bgp/util/pom.xml
+++ b/bgp/util/pom.xml
@@ -59,7 +59,7 @@
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/concepts/pom.xml b/concepts/pom.xml
index 9abc14bba4aba9a160b5266ef51b20f213a4b335..24daacd49847ddcf7ce02213e6eac218f5659b89 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -51,7 +51,7 @@
                    be here, but the plugin should bring it in.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <!--
@@ -60,7 +60,7 @@
                     discovered by the plugin.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 
@@ -75,7 +75,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/data-change-counter/pom.xml b/data-change-counter/pom.xml
index c268717dc439200a6cbfc815ed3f91b0751dcdaa..2ac6b9f40729d7a1695f2f7d020be88a48d27b3e 100644 (file)
--- a/data-change-counter/pom.xml
+++ b/data-change-counter/pom.xml
@@ -32,7 +32,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
+      <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
     </dependency>
     <dependency>
@@ -58,7 +58,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
     </dependency>
 

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 8e1df4fd802bec6674ce1c5c5a76af83874b85de..1834b00f49275465bf4199cd1d5d6228d9c28857 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -25,6 +25,7 @@
     <properties>
         <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
         <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
         <config.version>0.4.0-SNAPSHOT</config.version>
         <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
         <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
@@ -91,6 +92,22 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>features-mdsal</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <classifier>features</classifier>
+            <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/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index 34cee5e7683d18dc99e2f1c660aad22c092fafde..1538a12a2d060f423687ef6596fb3a2e7d2b6e9f 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -17,6 +17,8 @@
     <repository>mvn:org.opendaylight.controller/features-protocol-framework/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
+
 
     <feature name='odl-bgpcep-bgp-all' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp</feature>
@@ -36,7 +38,7 @@
     <feature name='odl-bgpcep-bgp-dependencies' version='${project.version}'>
         <!--  concepts -->
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->
         <bundle>mvn:commons-codec/commons-codec/{{VERSION}}</bundle>

diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml
index 2fccd08ffb7caa3b68d6b2c60401a162e4d63cb6..c7ffb23adfcf8b7709b034e38fc3888c0226cf37 100644 (file)
--- a/features/bmp/pom.xml
+++ b/features/bmp/pom.xml
@@ -1,25 +1,26 @@
 <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>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-    <artifactId>features-bmp</artifactId>
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <version>0.5.0-SNAPSHOT</version>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>features-parent</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+  <artifactId>features-bmp</artifactId>
+  <groupId>org.opendaylight.bgpcep</groupId>
+  <version>0.5.0-SNAPSHOT</version>
 
     <properties>
         <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>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
         <config.version>0.4.0-SNAPSHOT</config.version>
         <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
         <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
         <tcpmd5.version>1.2.0-SNAPSHOT</tcpmd5.version>
     </properties>
 
-    <dependencyManagement>
+      <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
@@ -46,11 +47,19 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${mdsal.model.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <!-- Controller infrastructure -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
+                <version>${controller.mdsal.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features/bmp/src/main/features/features.xml b/features/bmp/src/main/features/features.xml
index 77fcdbedb1c5ced7636111d7b1297d0f5934d940..9847e45d33186e90b5aa203eca3017e2816cc5d1 100644 (file)
--- a/features/bmp/src/main/features/features.xml
+++ b/features/bmp/src/main/features/features.xml
@@ -20,7 +20,7 @@
 
     <feature name='odl-bgpcep-bmp' version='${project.version}'>
         <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-dependencies</feature>
         <feature version='${config.version}'>odl-config-netty</feature>
         <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index 7b10c80e66065f30adb86d83181cb1079a97a917..659fdd264b90636b31127aee4c3eff572466a996 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -26,6 +26,7 @@
         <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
         <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
         <config.version>0.4.0-SNAPSHOT</config.version>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     </properties>
 
     <dependencyManagement>
@@ -47,6 +48,8 @@
                 <type>pom</type>
             </dependency>
 
+
+
             <!-- Controller infrastructure -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -73,6 +76,14 @@
             <classifier>features</classifier>
             <type>xml</type>
         </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>
@@ -120,4 +131,3 @@
       </dependency>
   </dependencies>
 </project>
-

diff --git a/features/extras/src/main/features/features.xml b/features/extras/src/main/features/features.xml
index ab4c91e84ebcb332f634310032a9640e12de00a9..401919069537e21ad9a4bc8093af7cd33b14e58f 100644 (file)
--- a/features/extras/src/main/features/features.xml
+++ b/features/extras/src/main/features/features.xml
@@ -15,11 +15,12 @@
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
 
     <feature name='odl-bgpcep-dependencies' version='${project.version}'>
         <!--  concepts -->
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->
         <bundle>mvn:commons-codec/commons-codec/{{VERSION}}</bundle>
@@ -36,4 +37,3 @@
         <bundle>mvn:org.opendaylight.bgpcep/data-change-counter/{{VERSION}}</bundle>
     </feature>
 </features>
-

diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml
index f8f5349c0512b78cd1412495826eba509a2b87c5..10285d75a0a992599f66474f8b1b7e46462ba0d9 100644 (file)
--- a/features/pcep/pom.xml
+++ b/features/pcep/pom.xml
@@ -29,6 +29,7 @@
         <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
         <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
         <tcpmd5.version>1.2.0-SNAPSHOT</tcpmd5.version>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     </properties>
 
     <dependencyManagement>
@@ -97,6 +98,22 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>features-mdsal</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <classifier>features</classifier>
+            <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-config</artifactId>
@@ -247,4 +264,3 @@
       </dependency>
   </dependencies>
 </project>
-

diff --git a/features/pcep/src/main/features/features.xml b/features/pcep/src/main/features/features.xml
index dc81be612b147bd5c9fa2b8c81175ce54292a178..4f3c3b1260753c36949394991c3aa51568f8b1ad 100644 (file)
--- a/features/pcep/src/main/features/features.xml
+++ b/features/pcep/src/main/features/features.xml
@@ -17,6 +17,7 @@
     <repository>mvn:org.opendaylight.controller/features-protocol-framework/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
 
     <feature name='odl-bgpcep-pcep-all' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep</feature>
@@ -37,7 +38,7 @@
     <feature name='odl-bgpcep-pcep-dependencies' version='${project.version}'>
         <!--  concepts -->
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <bundle>mvn:org.opendaylight.bgpcep/concepts/{{VERSION}}</bundle>
         <!-- util -->
         <bundle>mvn:commons-codec/commons-codec/{{VERSION}}</bundle>
@@ -115,4 +116,3 @@
         <configfile finalname="etc/opendaylight/karaf/33-pcep-segment-routing.xml">mvn:org.opendaylight.bgpcep/pcep-controller-config/{{VERSION}}/xml/config-segment</configfile>
     </feature>
 </features>
-

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index f1af28c07c945bc277d204f4c585527d9a41e720..ee0733e10b4c963f15e6a303984a2ffa72f48d22 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -122,6 +122,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- FIXME: remove this once controller migrates its runtime to use the mdsal project -->
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>yang-ext</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>ietf-netconf-monitoring</artifactId>
@@ -151,8 +158,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-api</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -253,8 +260,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-util</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -268,7 +275,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
             <scope>test</scope>
         </dependency>
@@ -361,7 +368,7 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
index 3e82a297714c45fd51f9e024aa7c7307e63ecf79..d6ab0252047c53a914a2bddd002d12ea9318fef9 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
@@ -71,7 +71,7 @@ public class AbstractPcepOsgiTest {
 
     private Option pcepModules() {
         return new DefaultCompositeOption(
-                mavenBundle("org.opendaylight.yangtools.model", "ietf-topology").versionAsInProject(), //
+                mavenBundle("org.opendaylight.mdsal.model", "ietf-topology").versionAsInProject(), //
                 mavenBundle("org.opendaylight.yangtools", "object-cache-api").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-topology-api").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-tunnel-api").versionAsInProject(), //

diff --git a/parent/pom.xml b/parent/pom.xml
index 5ff8b04b41d6de71ebe3457a11b42d228012c923..3443ca235bfe1b42ce39c64485451bb45887ab04 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -47,6 +47,10 @@
         <!-- YANG tools artifacts -->
         <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
 
+        <!-- MD-SAL artifacts -->
+        <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+
         <!-- Controller artifacts -->
         <controller.config.version>0.4.0-SNAPSHOT</controller.config.version>
         <controller.framework.version>0.7.0-SNAPSHOT</controller.framework.version>
@@ -89,6 +93,22 @@
                 <type>pom</type>
             </dependency>
 
+            <!-- MD-SAL -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${mdsal.model.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <!-- Controller infrastructure -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -400,7 +420,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/pcep/api/pom.xml b/pcep/api/pom.xml
index cbc961d610c76ca1010a987b11463d5ec132235a..88263fccab92d41654492c6edbaa6d04de119ae8 100644 (file)
--- a/pcep/api/pom.xml
+++ b/pcep/api/pom.xml
@@ -63,7 +63,7 @@
                    be here, but the plugin should bring it in.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -81,7 +81,7 @@
                     discovered by the plugin.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 

diff --git a/pcep/ietf-stateful07/pom.xml b/pcep/ietf-stateful07/pom.xml
index 09ed1131744e95c5968983d1c8e48600a2868456..aded22b9c43bdac279351607fbb44be4348c762b 100644 (file)
--- a/pcep/ietf-stateful07/pom.xml
+++ b/pcep/ietf-stateful07/pom.xml
@@ -78,11 +78,11 @@
                    be here, but the plugin should bring it in.
         -->
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>yang-ext</artifactId>
         </dependency>
         <dependency>
@@ -100,11 +100,11 @@
                     discovered by the plugin.
         -->
         <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>
         <dependency>

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 533d65892f2c970a62499e031e3d7326e80c1abf..5faaaa38ebd1e4661e9b0cd2f7d7920ca41c095c 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -100,7 +100,7 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>
@@ -108,7 +108,7 @@
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/pcep/pcc-mock/pom.xml b/pcep/pcc-mock/pom.xml
index 53f9de7704fa97e97e8ff3fecc1f9b2dd48f8bac..b973f13f67b44ae2e3c2000d73b4228231430a69 100644 (file)
--- a/pcep/pcc-mock/pom.xml
+++ b/pcep/pcc-mock/pom.xml
@@ -74,7 +74,7 @@
       <artifactId>logback-classic</artifactId>
     </dependency>
     <dependency>
-       <groupId>org.opendaylight.yangtools.model</groupId>
+       <groupId>org.opendaylight.mdsal.model</groupId>
        <artifactId>ietf-inet-types</artifactId>
     </dependency>
     <dependency>

diff --git a/pcep/segment-routing/pom.xml b/pcep/segment-routing/pom.xml
index c39a48d609f5f99a1add772008071ca7a08daac4..f078a12a44e0ca3b089a779452085b0482e2203c 100644 (file)
--- a/pcep/segment-routing/pom.xml
+++ b/pcep/segment-routing/pom.xml
@@ -60,7 +60,7 @@
       </dependency>
 
       <dependency>
-         <groupId>org.opendaylight.yangtools</groupId>
+         <groupId>org.opendaylight.mdsal</groupId>
          <artifactId>yang-binding</artifactId>
       </dependency>
       <dependency>
@@ -72,11 +72,11 @@
          <artifactId>concepts</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>
       <dependency>

diff --git a/pcep/spi/pom.xml b/pcep/spi/pom.xml
index 74a6ae2fa2e5501fb5c953a42be4b239d09f8f8d..2da3558c9cd7adce01abcf1267027fbb1b20169d 100644 (file)
--- a/pcep/spi/pom.xml
+++ b/pcep/spi/pom.xml
@@ -54,7 +54,7 @@
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/pcep/topology-api/pom.xml b/pcep/topology-api/pom.xml
index 293f67799e33e647b96038083cabe36d7697b3e7..cb07187a14ecb8d3466ccc3a9afec7974bc455f7 100644 (file)
--- a/pcep/topology-api/pom.xml
+++ b/pcep/topology-api/pom.xml
@@ -53,15 +53,15 @@
             <artifactId>programming-topology-api</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>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/pcep/topology-provider/pom.xml b/pcep/topology-provider/pom.xml
index fc83c867caf3ade18e3c9b383c6383ebd3d0b496..05debcc0ffe8731921a6afc845364419b422b3e5 100644 (file)
--- a/pcep/topology-provider/pom.xml
+++ b/pcep/topology-provider/pom.xml
@@ -103,15 +103,15 @@
             <artifactId>sal-binding-config</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>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/pcep/tunnel-api/pom.xml b/pcep/tunnel-api/pom.xml
index 3e2bba7c86597058195143184de074fb35d5ce39..3fac7df922491cf009982f50205b070e6f8d53bb 100644 (file)
--- a/pcep/tunnel-api/pom.xml
+++ b/pcep/tunnel-api/pom.xml
@@ -61,7 +61,7 @@
             <artifactId>topology-tunnel-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -73,7 +73,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>

diff --git a/pcep/tunnel-provider/pom.xml b/pcep/tunnel-provider/pom.xml
index 29aad781b0336f8a8811445e2d848908d113b661..504d59008d61b7fa924708f755b87a51ab56edfc 100644 (file)
--- a/pcep/tunnel-provider/pom.xml
+++ b/pcep/tunnel-provider/pom.xml
@@ -98,7 +98,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -110,15 +110,15 @@
             <artifactId>concepts</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>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology-l3-unicast-igp</artifactId>
         </dependency>
 

diff --git a/programming/api/pom.xml b/programming/api/pom.xml
index fbd6d3ba1511f699cc91be23f42327e11d886f67..d28fea1f1aee71db7f7025d09a6d1abf6cbb2cdf 100644 (file)
--- a/programming/api/pom.xml
+++ b/programming/api/pom.xml
@@ -33,7 +33,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -45,7 +45,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml
index 89bb7f9a6cd8b7c0a0aab171aedb6828a3a61e49..23044c708289fb336b6776edb4e6919a11204ef3 100644 (file)
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -63,7 +63,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -142,8 +142,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/programming/spi/pom.xml b/programming/spi/pom.xml
index 9b41edd58bc2b85842a948f15d591afb820a6cd1..5aedb77bfdb0600b689234ae031ba7a446d2f0af 100644 (file)
--- a/programming/spi/pom.xml
+++ b/programming/spi/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>

diff --git a/programming/topology-api/pom.xml b/programming/topology-api/pom.xml
index 4f6d520f6c273bb8673322ecaff2ba7513754381..b8b778e62b71f1dabb16afc930d640d8d0a59961 100644 (file)
--- a/programming/topology-api/pom.xml
+++ b/programming/topology-api/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -51,7 +51,7 @@
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>

diff --git a/programming/tunnel-api/pom.xml b/programming/tunnel-api/pom.xml
index a011054d27e720a3405f74a67b481cca6872d553..ff8012d9c1baabaaeee777a81fb3e7e87e3c9efc 100644 (file)
--- a/programming/tunnel-api/pom.xml
+++ b/programming/tunnel-api/pom.xml
@@ -41,7 +41,7 @@
             <artifactId>topology-tunnel-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -53,7 +53,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>

diff --git a/rsvp/api/pom.xml b/rsvp/api/pom.xml
index 8790cf3f74b1ec7b4350cc41157d0f5b05ab0139..03fad3d291ec8a6a7ed278353f667c60085854ce 100644 (file)
--- a/rsvp/api/pom.xml
+++ b/rsvp/api/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -51,7 +51,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
         <dependency>

diff --git a/topology/api/pom.xml b/topology/api/pom.xml
index cb4dd5b338a6908d66fbf8f3921a63923e831491..505f7dfed80f5f403a9e0f4e1351226998b17164 100644 (file)
--- a/topology/api/pom.xml
+++ b/topology/api/pom.xml
@@ -37,7 +37,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -49,11 +49,11 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>yang-ext</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>

diff --git a/topology/segment-routing/pom.xml b/topology/segment-routing/pom.xml
index 901024208009e1e4d479db9c6a73e7941655fcbd..1892aaaa4386a65561f77974a302225393c4e58c 100644 (file)
--- a/topology/segment-routing/pom.xml
+++ b/topology/segment-routing/pom.xml
@@ -37,7 +37,7 @@
             <artifactId>topology-tunnel-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -49,7 +49,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-topology</artifactId>
         </dependency>
         <dependency>

diff --git a/topology/tunnel-api/pom.xml b/topology/tunnel-api/pom.xml
index 195a93ca0912beab897d87ea633198d56a6e4de6..bfecfe90966e22e2cbc759fe185340ebdc24f96f 100644 (file)
--- a/topology/tunnel-api/pom.xml
+++ b/topology/tunnel-api/pom.xml
@@ -33,7 +33,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -45,11 +45,11 @@
             <artifactId>concepts</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>
         <dependency>

diff --git a/util/pom.xml b/util/pom.xml
index d478b83bc4cb692bcfbe4305631ab7805924c1ed..3d1d585f5bcaa5aa609a8e17f528b9ebb8ff8165 100644 (file)
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -54,7 +54,7 @@
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
+            <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>