Unify version handling

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index c01540c874f58c9921c059fb600206a5acf7b6e0..9f5be114dac83d7477458acda6d890acfc2816d2 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -69,6 +69,8 @@
 
         <!-- Controller artifacts -->
         <controller.config.version>0.2.3-SNAPSHOT</controller.config.version>
+        <controller.framework.version>0.4.0-SNAPSHOT</controller.framework.version>
+        <controller.mdsal.version>1.0-SNAPSHOT</controller.mdsal.version>
     </properties>
 
     <dependencyManagement>
@@ -166,12 +168,12 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>protocol-framework</artifactId>
-                <version>0.4.0-SNAPSHOT</version>
+                <version>${controller.framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>protocol-framework</artifactId>
-                <version>0.4.0-SNAPSHOT</version>
+                <version>${controller.framework.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
@@ -188,28 +190,28 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-api</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>${controller.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-config</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>${controller.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>${controller.mdsal.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-util</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>${controller.mdsal.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-broker-impl</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>${controller.mdsal.version}</version>
                 <scope>test</scope>
             </dependency>
 

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 77b5ffa1fc7682f66ae93256ed498a44c55a0e8f..c13a78d31a6359fdb8d7e8bd1bf5de1963d661ba 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -39,7 +39,6 @@
         <url.version>1.6.0</url.version>
         <antlr.version>4.0</antlr.version>
         <xtend-lib-osgi.version>2.4.3</xtend-lib-osgi.version>
-        <logback-classic.version>1.0.9</logback-classic.version>
         <moxy.controller.version>2.5.0</moxy.controller.version>
     </properties>
 
@@ -100,8 +99,6 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>${logback-classic.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>