X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fpom.xml;h=699cf8ff7cca5d0828502018abac23201a8713ef;hb=20c94087d529eb545e10b71c56e18af17f0f2337;hp=fb1f48b0084fafa7315babbc0577aa3e4b8898f7;hpb=72380c1c73543eb37b16d557a0950db2b159dc17;p=mdsal.git

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index fb1f48b008..699cf8ff7c 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,13 +13,13 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.2</version>
+      <version>6.0.5</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>mdsal-artifacts</artifactId>
-    <version>2.7.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
@@ -28,14 +28,14 @@
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>features-mdsal</artifactId>
                 <classifier>features</classifier>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>features-mdsal-experimental</artifactId>
                 <classifier>features</classifier>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <type>xml</type>
             </dependency>
 
@@ -43,250 +43,213 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-common-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-common-util</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-dom-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-dom-spi</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-dom-broker</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-dom-schema-service-osgi</artifactId>
-                <version>${project.version}</version>
+                <artifactId>mdsal-dom-schema-osgi</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-dom-inmemory-datastore</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Binding MD-SAL & Java Binding -->
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>maven-sal-api-gen-plugin</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-generator-api</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-generator-util</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-generator-impl</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-java-api-generator</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>yang-binding</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-spec-util</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-dom-codec</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-dom-codec-osgi</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-test-model</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <scope>test</scope>
             </dependency>
 
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-dom-adapter</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-binding-dom-adapter</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-test-utils</artifactId>
-                <version>${project.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>yang-ext</artifactId>
-                <version>2013.09.07.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>general-entity</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-dom-codec-api</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding-test-model</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-                <scope>test</scope>
+                <artifactId>mdsal-binding-dom-codec-spi</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
-
-            <!-- Binding specification version 2-->
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-maven-api-gen-plugin</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-dom-codec</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-runtime</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-runtime-api</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-dom-codec</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-runtime-spi</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-api</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-runtime-osgi</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-dom-adapter</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-spi</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-spi</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-util</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-test-model</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <artifactId>mdsal-binding-test-utils</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
+
             <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-generator-api</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-spec</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-generator-impl</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-java-api-generator</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-generator-util</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-binding2-util</artifactId>
-                <version>0.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>yang-ext</artifactId>
+                <version>2013.09.07.18.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model.binding2</groupId>
-                <artifactId>yang-ext</artifactId>
-                <version>2013.09.07.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>general-entity</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-common-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-common-spi</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-dom-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-dom-simple</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-binding-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-eos-binding-adapter</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-singleton-common-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-singleton-dom-impl</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-trace-api</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-trace-cli</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-trace-impl</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Features -->
@@ -294,174 +257,194 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-binding</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-binding-base</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-binding-runtime-api</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-binding-runtime</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-binding-api</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-binding-dom-adapter</artifactId>
-                <version>${project.version}</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
 
-            <!-- BINDING2 -->
+            <!-- DOM -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-binding2</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-dom</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-binding2-base</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-dom-api</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-binding2-runtime</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-dom-broker</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
+            <!-- COMMON -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-binding2-api</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-common</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
+            <!-- EOS -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-binding2-dom-adapter</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-eos-common</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
-            <!-- DOM -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-dom</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-eos-dom</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-dom-api</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-eos-binding</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
+            <!-- SINGLETON -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-dom-broker</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-singleton-common</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
-            <!-- COMMON -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-common</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-singleton-dom</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
 
-            <!-- EOS -->
+            <!-- YANG Library -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-yanglib-api</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-yanglib-rfc7895</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-yanglib-rfc8525</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-eos-common</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-exp-yanglib-api</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-eos-dom</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-exp-yanglib-rfc7895</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-eos-binding</artifactId>
-                <version>${project.version}</version>
+                <artifactId>odl-mdsal-exp-yanglib-rfc8525</artifactId>
+                <version>0.11.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
 
-            <!-- SINGLETON -->
+            <!-- uint24 support -->
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-singleton-common</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-uint24</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-singleton-dom</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-uint24-netty</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- MODELS -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>opendaylight-l2-types</artifactId>
-                <version>2013.08.27.15.0-SNAPSHOT</version>
+                <version>2013.08.27.18.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC6991 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc6991</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc6991-ietf-inet-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc6991-ietf-yang-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-type-util</artifactId>
-                <version>2.3.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7223 -->
@@ -469,14 +452,21 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc7223</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
-            <!-- RFC7224, live version lives here: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->
+            <!-- RFC7224-20170119, live version: https://github.com/YangModels/yang/blob/master/standard/ietf/RFC/iana-if-type.yang -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>iana-if-type-2014-05-08</artifactId>
-                <version>2014.05.08.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+                <artifactId>iana-if-type</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC7224-20180703 version: http://www.iana.org/assignments/yang-parameters/iana-if-type@2018-07-03.yang -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
+                <artifactId>rfc7224-20180703-iana-if-type</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7277 -->
@@ -484,148 +474,225 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc7277</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7895 -->
+            <!-- FIXME: upgrade this to RFC8525 (2019-01-04, NMDA) -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc7895</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC7952 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc7952</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8294 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8294</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8294-ietf-routing-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
                 <artifactId>iana-routing-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8342 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8342</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8342-ietf-datastores</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8342-ietf-origin</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8343 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8343</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8344 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8344</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8345 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8345</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8345-ietf-network</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8345-ietf-network-state</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8345-ietf-network-topology</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8345-ietf-network-topology-state</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8348 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8348</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8348-ietf-hardware</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8348-ietf-hardware-state</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
                 <artifactId>iana-hardware</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- RFC8349 -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8349</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8349-ietf-routing</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8349-ietf-ipv4-unicast-routing</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
                 <artifactId>rfc8349-ietf-ipv6-unicast-routing</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
-            <!-- draft-bierman-netconf-restconf-02 -->
-            <!-- FIXME: upgrade to RFC8040 -->
+            <!-- RFC8519 -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-restconf</artifactId>
-                <version>2013.10.19.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8519</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8519-ietf-access-control-list</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8519-ietf-ethertypes</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8519-ietf-packet-fields</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8520 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8520</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8520-ietf-acldns</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8520-ietf-mud</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8525 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8525</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8528 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8528</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8529 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8529</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8530 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8530</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- RFC8542 -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8542</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8542-ietf-dc-fabric-topology</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc8542-ietf-dc-fabric-types</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- draft-clemm-netmod-yang-network-topo-01 -->
@@ -637,37 +704,32 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-ted</artifactId>
-                <version>2013.10.21.15.0-SNAPSHOT</version>
+                <version>2013.10.21.18.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-topology</artifactId>
-                <version>2013.10.21.15.0-SNAPSHOT</version>
+                <version>2013.10.21.18.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-topology-isis</artifactId>
-                <version>2013.10.21.15.0-SNAPSHOT</version>
+                <version>2013.10.21.18.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-                <version>2013.10.21.15.0-SNAPSHOT</version>
+                <version>2013.10.21.18.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-topology-ospf</artifactId>
-                <version>2013.10.21.15.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-topology-l3-unicast</artifactId>
-                <version>2013.10.21.15.0-SNAPSHOT</version>
+                <version>2013.10.21.18.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-lisp-address-types-2015-11-05</artifactId>
-                <version>1.4.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
             </dependency>
 
             <!-- draft-ietf-netmod-acl-model-07 -->
@@ -676,177 +738,240 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-packet-fields</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.16.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-access-control-list</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
+                <version>0.16.0-SNAPSHOT</version>
             </dependency>
 
             <!-- draft-ietf-netmod-iana-afn-safi-00, expired -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>iana-afn-safi</artifactId>
-                <version>2013.07.04.15.0-SNAPSHOT</version>
+                <version>2013.07.04.18.0-SNAPSHOT</version>
             </dependency>
 
             <!-- Features -->
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc6991</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc7223</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc7224</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc7277</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc7895</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc7952</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8294</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8342</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8343</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8344</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8345</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8345-non-nmda</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8348</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8348-non-nmda</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-rfc8349</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8519</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8520</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8525</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>odl-mdsal-model-draft-bierman-netconf-restconf-02</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <artifactId>odl-mdsal-model-rfc8528</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8529</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8530</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-rfc8542</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-draft-ietf-lisp-lcaf-10</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-draft-ietf-netmod-acl-model-07</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-draft-ietf-netmod-iana-afn-safi-00</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>odl-mdsal-model-odl-l2-types</artifactId>
-                <version>1.2.0-SNAPSHOT</version>
+                <version>6.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>odl-mdsal-model-odl-uint24</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>odl-mdsal-uint24-netty</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
+            <!-- Documentation -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-docs</artifactId>
+                <version>6.0.0-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>