Bump yangtools to 1.0.0-SNAPSHOT

Change-Id: I6fcaa3f30b53cd35f5d8f619d960ace449019a0a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/applications/features/pom.xml b/applications/features/pom.xml
index 429aa7894412f2fbfd3305d5bc08215804bdfa81..864bacd565306ab340db041223edce33bd1d1e72 100644 (file)
--- a/applications/features/pom.xml
+++ b/applications/features/pom.xml
@@ -14,7 +14,7 @@
   <packaging>jar</packaging>
 
   <properties>
   <packaging>jar</packaging>
 
   <properties>

-    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>

     <config.version>0.5.0-SNAPSHOT</config.version>
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
     <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
     <config.version>0.5.0-SNAPSHOT</config.version>
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
     <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>

diff --git a/applications/features/src/main/features/features.xml b/applications/features/src/main/features/features.xml
index e784c773417629f262475812789e9fa013991567..e73e62689340199dd88b97800dae3d3ac4ab9599 100644 (file)
--- a/applications/features/src/main/features/features.xml
+++ b/applications/features/src/main/features/features.xml
@@ -5,7 +5,7 @@
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <feature name='odl-flow-model' version='${project.version}' description="OpenDaylight :: Flow :: Model">
    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <feature name='odl-flow-model' version='${project.version}' description="OpenDaylight :: Flow :: Model">

-        <feature version='${yangtools.version}'>odl-mdsal-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>

         <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>

diff --git a/applications/pom.xml b/applications/pom.xml
index f288e0082880892da9a5fe864bb29723d36ca73c..3ec52403bf38829a46462d64544e583164f31ef9 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -61,7 +61,7 @@
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>

-                            <version>${yangtools.version}</version>
+                            <version>${mdsal.model.version}</version>

                             <type>jar</type>
                         </dependency>
                     </dependencies>
                             <type>jar</type>
                         </dependency>
                     </dependencies>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index 2f863297fe9f696014b3b3fabc19daeaf8214d4a..563de788ce3816f6d8eecf510d28da2e11a2fcb8 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -117,7 +117,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/extension/openflowjava-extension-nicira-api/pom.xml b/extension/openflowjava-extension-nicira-api/pom.xml
index e7f4041b8966ad918edda3ae0fdd069c36368659..628180ba45357aa71be38c01c011526d83f31d9c 100644 (file)
--- a/extension/openflowjava-extension-nicira-api/pom.xml
+++ b/extension/openflowjava-extension-nicira-api/pom.xml
@@ -68,7 +68,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml
index db273cf0e764a699dc359e6e5a7a4b96e37ab598..50e4d98563588353248c658e43673aed18128c95 100644 (file)
--- a/extension/openflowjava-extension-nicira/pom.xml
+++ b/extension/openflowjava-extension-nicira/pom.xml
@@ -63,7 +63,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml
index ccf267ea959869b25606671b4d39aed690e44110..93eac204d394caaca2b51387099f76337abf5629 100644 (file)
--- a/extension/openflowplugin-extension-api/pom.xml
+++ b/extension/openflowplugin-extension-api/pom.xml
@@ -64,7 +64,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml
index 933a8dc3875b70cec870d5b8a3261f0622b0cfdf..059538468efd3d842840c1231b7c5e964e04b39a 100644 (file)
--- a/extension/openflowplugin-extension-nicira/pom.xml
+++ b/extension/openflowplugin-extension-nicira/pom.xml
@@ -64,7 +64,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml
index b9c01087153295619b55008bc20a640f968df082..f1dbd1fa8e6de36789afce8f0f525a1bc2354deb 100644 (file)
--- a/extension/test-extension/pom.xml
+++ b/extension/test-extension/pom.xml
@@ -64,7 +64,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/features-li/pom.xml b/features-li/pom.xml
index 4e5bfd722bf86a5992f44d620a0103e8b1f40728..6d8a8853a6ddd303186c7ee8377f24eb258833d2 100644 (file)
--- a/features-li/pom.xml
+++ b/features-li/pom.xml
@@ -15,7 +15,7 @@
     <version>0.3.0-SNAPSHOT</version>
 
     <properties>
     <version>0.3.0-SNAPSHOT</version>
 
     <properties>

-        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>

         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
         <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
         <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>

diff --git a/features-li/src/main/features/features.xml b/features-li/src/main/features/features.xml
index 6a3bde96c33ea5e79e3c282b91b9ca5f96498f27..000a3d46fe58541fa076bac1ca32a8591f88f7ba 100644 (file)
--- a/features-li/src/main/features/features.xml
+++ b/features-li/src/main/features/features.xml
@@ -65,7 +65,7 @@
     <feature name='odl-openflowplugin-nsf-model-li' version='${project.version}'
              description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
         <!-- general models -->
     <feature name='odl-openflowplugin-nsf-model-li' version='${project.version}'
              description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
         <!-- general models -->

-        <feature version='${yangtools.version}'>odl-mdsal-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>

        <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
        <bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
         <!-- openflow specific models -->
        <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
        <bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
         <!-- openflow specific models -->

diff --git a/features/pom.xml b/features/pom.xml
index d40ce958d9c7fe1ee65bb13fe8a55322a44bd944..c02e3c1d8a21be6f033fe23fe272dc226769d7ac 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -15,7 +15,7 @@
     <version>0.3.0-SNAPSHOT</version>
 
     <properties>
     <version>0.3.0-SNAPSHOT</version>
 
     <properties>

-        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>

         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
         <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
         <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index d15955b0d9a4b27c115f8da637a4c0576e70e394..36e80a25b53b7d085655c8c229f7763d3fd82dd8 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -66,7 +66,7 @@
     <feature name='odl-openflowplugin-nsf-model' version='${project.version}'
         description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
         <!-- general models -->
     <feature name='odl-openflowplugin-nsf-model' version='${project.version}'
         description="OpenDaylight :: OpenflowPlugin :: NSF :: Model">
         <!-- general models -->

-        <feature version='${yangtools.version}'>odl-mdsal-models</feature>
+        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>

        <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
        <bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
         <!-- openflow specific models -->
        <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
        <bundle>mvn:org.opendaylight.controller.model/model-topology/{{VERSION}}</bundle>
         <!-- openflow specific models -->

diff --git a/model/pom.xml b/model/pom.xml
index 37d09a80797ca4f66283bac7cd8e30f9a3398347..3c746bf4885c39bdbb24e1867fc142ba69ee8e4d 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -66,13 +66,13 @@
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>

-            <version>${yangtools.version}</version>
+            <version>${mdsal.model.version}</version>

             <type>jar</type>
           </dependency>
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
             <type>jar</type>
           </dependency>
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>

-            <version>${yangtools.version}</version>
+            <version>${mdsal.model.version}</version>

             <type>jar</type>
           </dependency>
         </dependencies>
             <type>jar</type>
           </dependency>
         </dependencies>

diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index b4cfcc5be672c467215d6f37e78ffa6459289c69..4edbc3ce4717d2faedaf294b9b53040a894355c2 100644 (file)
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -62,7 +62,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 3acb3bd3bb72436dfa34f19388bb58a4148abe62..596bea7583b548d1e5254e2439b3030610c1de28 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -62,7 +62,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index 4663c10f59d096a8ea1a2c7de743baf22cc8168f..b3eaeeaac02e0a0a604e05b166385bad329462aa 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -62,7 +62,7 @@
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.mdsal</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.version}</version>
+                        <version>${mdsal.model.version}</version>

                         <type>jar</type>
                     </dependency>
                 </dependencies>
                         <type>jar</type>
                     </dependency>
                 </dependencies>

diff --git a/parent/pom.xml b/parent/pom.xml
index be2d47858f19e8cec53851545106c5e9f9ae7794..3a2f883f43f780ea9de415b745898106e8d33614 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -42,7 +42,8 @@
 
         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
 
         <config.version>0.5.0-SNAPSHOT</config.version>
         <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>

-        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>

     </properties>
 
     <dependencyManagement>
     </properties>
 
     <dependencyManagement>


@@ -72,7 +73,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>

-                <version>0.9.0-SNAPSHOT</version>
+                <version>${mdsal.model.version}</version>

                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>