Rename RFC6991 model artifacts

This patch renames ietf-{inet,yang}-types artifacts to follow
unified naming.

Change-Id: I72e14257f9df4487e8f26940178dee244a4e32cd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 230f8f23e227d000347eadd325bd2ba4da3273d4..7eeda33a322622d7f34634a93af87874948c8ea6 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -436,17 +436,20 @@
             </dependency>
 
             <!-- RFC6991 -->
-            <!-- FIXME: harmonize packaging of these two, as per the discussion at
-                 https://lists.opendaylight.org/pipermail/mdsal-dev/2018-April/001656.html -->
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-inet-types-2013-07-15</artifactId>
-                <version>1.7.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc6991</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>ietf-yang-types-20130715</artifactId>
-                <version>2013.07.15.15.0-SNAPSHOT</version>
+                <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+                <artifactId>rfc6991-ietf-inet-types</artifactId>
+                <version>1.2.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>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/model/features/odl-mdsal-model-rfc6991/pom.xml b/model/features/odl-mdsal-model-rfc6991/pom.xml
index e3cba47638f2aed6ade3833d97dd39ff11b3a36c..aab913bda91b1cef93654e3436aa22b5fe83369e 100644 (file)
--- a/model/features/odl-mdsal-model-rfc6991/pom.xml
+++ b/model/features/odl-mdsal-model-rfc6991/pom.xml
@@ -43,16 +43,8 @@
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-type-util</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-interfaces/pom.xml b/model/ietf/ietf-interfaces/pom.xml
index 97a4c02eb7f24e5f509c57ff316b877a62cf84d2..efa784ac580bfa6c98cb4aef778cc27a4ac7f74d 100644 (file)
--- a/model/ietf/ietf-interfaces/pom.xml
+++ b/model/ietf/ietf-interfaces/pom.xml
@@ -26,8 +26,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-ip-2014-06-16/pom.xml b/model/ietf/ietf-ip-2014-06-16/pom.xml
index 51bba103641a37e3787fac869e82b51914898e8f..d98181419f29569b492b720bbff81e02fc28c7c8 100644 (file)
--- a/model/ietf/ietf-ip-2014-06-16/pom.xml
+++ b/model/ietf/ietf-ip-2014-06-16/pom.xml
@@ -31,13 +31,8 @@
             <artifactId>ietf-interfaces</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
-
 </project>

diff --git a/model/ietf/ietf-lisp-address-types/pom.xml b/model/ietf/ietf-lisp-address-types/pom.xml
index ee4c77faf76bc97b2169263d54a577f0b3b1fa99..684bb658f258cd0a148bdfc4d25882baef9c2f1a 100644 (file)
--- a/model/ietf/ietf-lisp-address-types/pom.xml
+++ b/model/ietf/ietf-lisp-address-types/pom.xml
@@ -26,12 +26,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-packet-fields/pom.xml b/model/ietf/ietf-packet-fields/pom.xml
index c9d73e37b3c4a2ca2fb895cac7b8a4769017bed5..516a96f1c618f2ab33fab0e38b2a6b0075a21c43 100644 (file)
--- a/model/ietf/ietf-packet-fields/pom.xml
+++ b/model/ietf/ietf-packet-fields/pom.xml
@@ -26,16 +26,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-interfaces</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
+            <artifactId>ietf-interfaces</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml
index 97f8ef0a025bcd591101d62d06991cb483c12fd0..d73808aa20cceb8a147c5d9618d7a91b1419dad0 100644 (file)
--- a/model/ietf/ietf-restconf/pom.xml
+++ b/model/ietf/ietf-restconf/pom.xml
@@ -27,13 +27,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <!--  TODO: We need a better way to handle versioning... -->
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
 
         <dependency>

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index cfc6933b2bb61cb83ad24fb5f92002c06cf8980f..9a537bea485556ee649ef2d29e076e033129352e 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -26,12 +26,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 78d414cb4667b68ab4ea2b3d7be936078d917783..fa6160468e87a556285be18308bff13579ea1882 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -25,12 +25,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index b8fbd8cf0f9098b56454897a288e480912127ecf..d9f333b017b53f2691d12cf3456d31ec164d8633 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -26,8 +26,9 @@
 
     <modules>
         <!-- RFC6991 -->
-        <module>ietf-inet-types-2013-07-15</module>
-        <module>ietf-yang-types-20130715</module>
+        <module>rfc6991</module>
+        <module>rfc6991-ietf-inet-types</module>
+        <module>rfc6991-ietf-yang-types</module>
         <module>ietf-type-util</module>
 
         <!-- RFC7223 -->

diff --git a/model/ietf/ietf-inet-types-2013-07-15/pom.xml b/model/ietf/rfc6991-ietf-inet-types/pom.xml
similarity index 89%
rename from model/ietf/ietf-inet-types-2013-07-15/pom.xml
rename to model/ietf/rfc6991-ietf-inet-types/pom.xml
index 8d09a387bcbbcaeecd8ca5924740596047fb28bf..c5d1c3bc139759ad6adbbac67b18594bb4f0d382 100644 (file)
--- a/model/ietf/ietf-inet-types-2013-07-15/pom.xml
+++ b/model/ietf/rfc6991-ietf-inet-types/pom.xml
@@ -10,6 +10,8 @@
 <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.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
@@ -17,13 +19,13 @@
         <relativePath>../../../binding/binding-parent</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+    <artifactId>rfc6991-ietf-inet-types</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
-    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java
rename to model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java
rename to model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtil.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java
rename to model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java
rename to model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java b/model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java
rename to model/ietf/rfc6991-ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/main/yang/ietf-inet-types@2013-07-15.yang b/model/ietf/rfc6991-ietf-inet-types/src/main/yang/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/main/yang/ietf-inet-types@2013-07-15.yang
rename to model/ietf/rfc6991-ietf-inet-types/src/main/yang/ietf-inet-types@2013-07-15.yang

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java
rename to model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilderTest.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtilTest.java b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtilTest.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtilTest.java
rename to model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IetfInetUtilTest.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilderTest.java b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilderTest.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilderTest.java
rename to model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilderTest.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilderTest.java b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilderTest.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilderTest.java
rename to model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilderTest.java

diff --git a/model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilderTest.java b/model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilderTest.java
similarity index 100%
rename from model/ietf/ietf-inet-types-2013-07-15/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilderTest.java
rename to model/ietf/rfc6991-ietf-inet-types/src/test/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilderTest.java

diff --git a/model/ietf/ietf-yang-types-20130715/pom.xml b/model/ietf/rfc6991-ietf-yang-types/pom.xml
similarity index 88%
rename from model/ietf/ietf-yang-types-20130715/pom.xml
rename to model/ietf/rfc6991-ietf-yang-types/pom.xml
index 92a86e9b9639f1dc35cd095380a25a53ae42a41c..138a4d1bf442b708882419b659e0f9c01ce5824e 100644 (file)
--- a/model/ietf/ietf-yang-types-20130715/pom.xml
+++ b/model/ietf/rfc6991-ietf-yang-types/pom.xml
@@ -18,9 +18,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.mdsal.model</groupId>
-    <artifactId>ietf-yang-types-20130715</artifactId>
-    <version>2013.07.15.15.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+    <artifactId>rfc6991-ietf-yang-types</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
     <packaging>bundle</packaging>

diff --git a/model/ietf/ietf-yang-types-20130715/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java b/model/ietf/rfc6991-ietf-yang-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java
similarity index 100%
rename from model/ietf/ietf-yang-types-20130715/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java
rename to model/ietf/rfc6991-ietf-yang-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/yang/types/rev130715/IetfYangUtil.java

diff --git a/model/ietf/ietf-yang-types-20130715/src/main/yang/ietf-yang-types@2013-07-15.yang b/model/ietf/rfc6991-ietf-yang-types/src/main/yang/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from model/ietf/ietf-yang-types-20130715/src/main/yang/ietf-yang-types@2013-07-15.yang
rename to model/ietf/rfc6991-ietf-yang-types/src/main/yang/ietf-yang-types@2013-07-15.yang

diff --git a/model/ietf/rfc6991/pom.xml b/model/ietf/rfc6991/pom.xml
new file mode 100644 (file)
index 0000000..01a8ed9
--- /dev/null
+++ b/model/ietf/rfc6991/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+    <artifactId>rfc6991</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>RFC6991 Common YANG Data Types</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>2.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/model/ietf/rfc7895/pom.xml b/model/ietf/rfc7895/pom.xml
index 1262dc47c6a087f0084979a8450182f5e96d24a2..87bcd0f9ed4ac8e0e91b5b09e240b47f35a7ca33 100644 (file)
--- a/model/ietf/rfc7895/pom.xml
+++ b/model/ietf/rfc7895/pom.xml
@@ -27,12 +27,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/rfc8294-ietf-routing-types/pom.xml b/model/ietf/rfc8294-ietf-routing-types/pom.xml
index c4463769a3d3a6949f92129b99b1a6a68553bdbe..a9b90614483298061d06a923e7f4fc7e2b5fb972 100644 (file)
--- a/model/ietf/rfc8294-ietf-routing-types/pom.xml
+++ b/model/ietf/rfc8294-ietf-routing-types/pom.xml
@@ -28,12 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/rfc8343/pom.xml b/model/ietf/rfc8343/pom.xml
index 1b4db43c5ddc40967029cf1a473f1f6910818a7a..e4eb6e2ece620fd51cc990181251d06316f6efdc 100644 (file)
--- a/model/ietf/rfc8343/pom.xml
+++ b/model/ietf/rfc8343/pom.xml
@@ -28,8 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/rfc8344/pom.xml b/model/ietf/rfc8344/pom.xml
index 190c9d7e9b72ba502c9d9c7b15a76073a9f2a0ec..36924c7dd30b564a9a960bc4bd8494c123934efe 100644 (file)
--- a/model/ietf/rfc8344/pom.xml
+++ b/model/ietf/rfc8344/pom.xml
@@ -28,12 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8345-ietf-network/pom.xml b/model/ietf/rfc8345-ietf-network/pom.xml
index 5c3cceb452cf36841e075c6b0a5843acd22cc064..3415196757327561f7a9500bc83dc9251b1d3438 100644 (file)
--- a/model/ietf/rfc8345-ietf-network/pom.xml
+++ b/model/ietf/rfc8345-ietf-network/pom.xml
@@ -28,8 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/rfc8348-ietf-hardware/pom.xml b/model/ietf/rfc8348-ietf-hardware/pom.xml
index ece4a007aba9f44a3b13624129e37f36a141caf5..18759aa8f510eec7f4734a066a12d6ba0d94aae4 100644 (file)
--- a/model/ietf/rfc8348-ietf-hardware/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware/pom.xml
@@ -27,17 +27,13 @@
     <description>RFC8348 ietf-hardware</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
             <artifactId>iana-hardware</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
index 6b3712f942696488fe8b4cf7776435d5803326c2..e8936ce93330e56b1fb5dbe267c739d12ae7bedc 100644 (file)
--- a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
@@ -28,8 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-inet-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/model/ietf/rfc8349-ietf-routing/pom.xml b/model/ietf/rfc8349-ietf-routing/pom.xml
index 18dde99121dd29b107c033dcb7fe8bca62f73bba..1b7c50d429f74799b7deb703820a2bbb2e22193e 100644 (file)
--- a/model/ietf/rfc8349-ietf-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-routing/pom.xml
@@ -28,8 +28,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>