Unify version handling

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 6252336a47c0cefad59e989326974d00a42db927..9562c15772446f85d6f14052d7ad86396f332d64 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -62,7 +62,6 @@
         <surefire.version>2.15</surefire.version>
 
         <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>
-        <yang.binding.version>0.6.0-SNAPSHOT</yang.binding.version>
 
         <controller.config.version>0.2.3-SNAPSHOT</controller.config.version>
         <ietf.types.version>2010.09.24.2-SNAPSHOT</ietf.types.version>
@@ -100,8 +99,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>mockito-configuration</artifactId>
-                <!-- FIXME: change to yangtools.version once it's 0.6.0 -->
-                <version>${yang.binding.version}</version>
+                <version>${yangtools.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -154,7 +152,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
-                <version>${yang.binding.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
@@ -485,7 +483,7 @@
                         <dependency>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>${yang.binding.version}</version>
+                            <version>${yangtools.version}</version>
                             <type>jar</type>
                         </dependency>
                     <dependency>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index de5d6743fba8acd3ddfb3ca589b39eb6b5807f78..90a83af767b5156a9190d66c1bb62db42354a848 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -305,7 +305,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>${yangtools.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>