From 7db0eadf959b1d6918f4f9e8afd5ef05819d1580 Mon Sep 17 00:00:00 2001
From: Robert Varga <rovarga@cisco.com>
Date: Fri, 24 Jan 2014 13:37:37 +0100
Subject: [PATCH] Yangtools version police: remove references to non-current
 versions

Unifies the version property to yangtools.version, force restconf to use
the versions specified in the md-sal parent and bump its reference to
restconf-api to 0.6.0-SNAPSHOT.

Change-Id: I7b4820cf3995cd3dd3f108dd8b935ee38c62ea56
Signed-off-by: Robert Varga <rovarga@cisco.com>
---
 .../src/main/resources/archetype-resources/pom.xml        | 2 +-
 opendaylight/commons/opendaylight/pom.xml                 | 3 +--
 opendaylight/md-sal/pom.xml                               | 6 +++---
 opendaylight/md-sal/sal-remote/pom.xml                    | 8 ++------
 opendaylight/md-sal/sal-restconf-broker/pom.xml           | 6 +-----
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index 77f419a4ff..1dc40f25ba 100644
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -9,7 +9,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <yang.version>0.5.9-SNAPSHOT</yang.version>
+    <yang.version>0.6.0-SNAPSHOT</yang.version>
     <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
   </properties>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 64c873b347..406868c32b 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -56,7 +56,6 @@
     <jolokia.version>1.1.4</jolokia.version>
     <checkstyle.version>2.10</checkstyle.version>
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
-    <yang.version>0.5.9-SNAPSHOT</yang.version>
     <guava.version>14.0.1</guava.version>
     <osgi.core.version>5.0.0</osgi.core.version>
     <ietf-inet-types.version>2010.09.24.2-SNAPSHOT</ietf-inet-types.version>
@@ -667,7 +666,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>mockito-configuration</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>${yangtools.version}</version>
         <scope>test</scope>
       </dependency>
       <!-- yang model dependencies -->
diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index d383162748..d56259daf8 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -104,7 +104,7 @@
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>
-        <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
+	<yang.codegen.version>${yangtools.version}</yang.codegen.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
         <junit.version>4.8.1</junit.version>
@@ -300,12 +300,12 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-impl</artifactId>
-                <version>0.6.0-SNAPSHOT</version>
+		<version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-impl</artifactId>
-                <version>0.6.0-SNAPSHOT</version>
+		<version>${yangtools.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml
index d63cbfe781..5e6f585511 100644
--- a/opendaylight/md-sal/sal-remote/pom.xml
+++ b/opendaylight/md-sal/sal-remote/pom.xml
@@ -13,10 +13,6 @@
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
     </scm>
-    <properties>
-        <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
-        <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
-    </properties>
     <build>
         <plugins>
             <plugin>
@@ -27,7 +23,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <id>sal-remote</id>
@@ -58,7 +54,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${opendaylight.binding.version}</version>
+                        <version>${yangtools.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
diff --git a/opendaylight/md-sal/sal-restconf-broker/pom.xml b/opendaylight/md-sal/sal-restconf-broker/pom.xml
index ffef1a9953..8f31e6f96c 100644
--- a/opendaylight/md-sal/sal-restconf-broker/pom.xml
+++ b/opendaylight/md-sal/sal-restconf-broker/pom.xml
@@ -13,10 +13,6 @@
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
     </scm>
-    <properties>
-        <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
-        <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
-    </properties>
     <build>
         <plugins>
             <plugin>
@@ -46,7 +42,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>restconf-client-api</artifactId>
-            <version>0.2.0-SNAPSHOT</version>
+            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-- 
2.36.6