Refresh topology models and make them build

Change-Id: Id967846cc94e23b42b52df198fcb60a0704e27a7
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index 975cb9c46e571f8076389faa18310ab03e9ecbcf..daa067e45d5df99c982993fcf6b908b0dc7acfa1 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -16,12 +16,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>2010.09.24.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>2010.09.24.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
index 41d8655fd6d5cf83959b9d998475c5819b40e68b..890b9199a55f3ce3d4631a5f9b1b9704999b3a86 100644 (file)
--- a/model/ietf/ietf-topology-isis/pom.xml
+++ b/model/ietf/ietf-topology-isis/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.5.7-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -17,12 +17,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-            <version>2013.07.12-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-ted</artifactId>
-            <version>2013.07.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang
index 9ccf06cc052e0b19aa1486e901b991fd38d0b4d0..a24b67c5a94f61ab1d7625daefaef9be56fefd75 100644 (file)
--- a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang
+++ b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-07-12.yang
@@ -5,12 +5,15 @@ module isis-topology {
        prefix "isis";
        import network-topology {
            prefix nt;
+           revision-date 2013-07-12;
        }
        import l3-unicast-igp-topology {
                prefix igp;
+               revision-date 2013-07-12;
        }
        import ted {
                prefix ted;
+               revision-date 2013-07-12;
        }
        
        organization "TBD";

diff --git a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang
index 2e704bc50a8617e59f4a93bf23d0dd79346b95bd..9b2dd181c33e6b874f1df328e51c169850d05a42 100644 (file)
--- a/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang
+++ b/model/ietf/ietf-topology-isis/src/main/yang/isis-topology@2013-10-21.yang
@@ -5,12 +5,15 @@ module isis-topology {
     prefix "isis";
     import network-topology {
         prefix nt;
+        revision-date 2013-10-21;
     }
     import l3-unicast-igp-topology {
         prefix igp;
+        revision-date 2013-10-21;
     }
     import ted {
         prefix ted;
+        revision-date 2013-10-21;
     }
 
     organization "TBD";

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
index a08174032104afc2af62ec7e5ca3132bec251251..9689de6c9823b6ffdcbebcaf52059cca0fb0d555 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
+++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.5.7-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-topology</artifactId>
-            <version>2013.07.12-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang
index 2a10d690f0d703a2a11c160526258a6bbf40f767..99df396d1d7e286bc332c61c21ce417b37fcde95 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang
+++ b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-07-12.yang
@@ -5,6 +5,7 @@ module l3-unicast-igp-topology {
     prefix "l3t";
     import network-topology {
         prefix "nt";
+        revision-date 2013-07-12;
     }
     
     import ietf-inet-types {

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang
index f01d43b0c7488a2913206573c96c10d465da7a0f..894d9b81f80f7b0eb862186a158a481e4d956c31 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang
+++ b/model/ietf/ietf-topology-l3-unicast-igp/src/main/yang/l3-unicast-igp-topology@2013-10-21.yang
@@ -5,6 +5,7 @@ module l3-unicast-igp-topology {
     prefix "l3t";
     import network-topology {
         prefix "nt";
+        revision-date 2013-10-21;
     }
 
     import ietf-inet-types {

diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
index 638a266434a4e9a4dee045f84e552f350a1da331..858bf9d783ba5b5f063a63140b720c9a89ab3191 100644 (file)
--- a/model/ietf/ietf-topology-ospf/pom.xml
+++ b/model/ietf/ietf-topology-ospf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.5.7-SNAPSHOT</version>
+        <version>0.1.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,13 +16,11 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>model-l3-unicast-igp-topology</artifactId>
-            <version>2013.07.12-SNAPSHOT</version>
+            <artifactId>ietf-topology-l3-unicast-igp</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>model-ted</artifactId>
-            <version>2013.07.12-SNAPSHOT</version>
+            <artifactId>ietf-ted</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang
index 576cd8262b9c44f2b40831ce191536e6331a78b3..166573c43603c33f1c300e8a994988464cf12aeb 100644 (file)
--- a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang
+++ b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology.yang@2013-10-21.yang
@@ -7,16 +7,19 @@ module ospf-topology {
 
     import network-topology {
         prefix "nt";
+        revision-date 2013-10-21;
     }
 
     import l3-unicast-igp-topology {
         prefix "l3t";
+        revision-date 2013-10-21;
     }
     import ietf-inet-types {
         prefix "inet";
     }
     import ted {
         prefix "ted";
+        revision-date 2013-10-21;
     }
 
     organization "TBD";

diff --git a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang
index 49df1fb87068a505c63409030e581d3dbedef66d..6c85ce10d5dd44c05ac3867c1c9d9c19e50fd609 100644 (file)
--- a/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang
+++ b/model/ietf/ietf-topology-ospf/src/main/yang/ospf-topology@2013-07-12.yang
@@ -1,21 +1,24 @@
 ňmodule ospf-topology {
     yang-version 1;
     namespace "urn:ietf:params:xml:ns:yang:ospf-topology";
-       // replace with IANA namespace when assigned
+    // replace with IANA namespace when assigned
     prefix "ospf";
 
     import network-topology {
-               prefix "nt";
+        prefix "nt";
+        revision-date 2013-07-12;
     }
 
     import l3-unicast-igp-topology {
-               prefix "igp";
+        prefix "igp";
+        revision-date 2013-07-12;
     }
     import ietf-inet-types {
-               prefix "inet";
+        prefix "inet";
     }
     import ted {
-               prefix "ted";
+        prefix "ted";
+        revision-date 2013-07-12;
     }
 
     organization "TBD";

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 25411ce093a77202dc64757f1ca09e2cbd637ce2..cde8889fd357aebb079d3fb4365ecd8ab271dc85 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -17,12 +17,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>2010.09.24.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>2010.09.24.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 0c6a1452c1ecc587ed7016e3331effeacb74501d..59accecda1da458515f06de151ff3f3ddae8f9bc 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -12,16 +12,57 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
+    <properties>
+        <ietf.topology.version>2013.10.21.0-SNAPSHOT</ietf.topology.version>
+    </properties>
     <modules>
         <module>ietf-inet-types</module>
         <module>ietf-yang-types</module>
         <module>ietf-ted</module>
         <module>ietf-topology</module>
-        <!--module>ietf-netconf</module -->
-        <!-- 
-        <module>ietf-topology-l3-unicast-igp</module>
         <module>ietf-topology-isis</module>
+        <module>ietf-topology-l3-unicast-igp</module>
         <module>ietf-topology-ospf</module>
-         -->
+        <!--module>ietf-netconf</module -->
     </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-inet-types</artifactId>
+                <version>2010.09.24.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-yang-types</artifactId>
+                <version>2010.09.24.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-ted</artifactId>
+                <version>${ietf.topology.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-topology</artifactId>
+                <version>${ietf.topology.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-topology-isis</artifactId>
+                <version>${ietf.topology.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-topology-l3-unicast-igp</artifactId>
+                <version>${ietf.topology.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-topology-ospf</artifactId>
+                <version>${ietf.topology.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>