Use controller.mdsal.version when appropriate

Use the property controller.mdsal.version when looking for mdsal
artifacts from org.opendaylight.controller.

Otherwise, it's confusing since mdsal.version actually referrs to
artifacts from org.opendaylight.mdsal.

Change-Id: I58019ccb199ba1aa5ace515d6f2601c93f9b21b5
Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>

diff --git a/parent/pom.xml b/parent/pom.xml
index 103a32fbba04955880bee5bc2e5f275dc812134d..1554d92b257a2e9519ee0cea0704e0a4c6f0274b 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
         <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
 
         <config.version>0.5.0-SNAPSHOT</config.version>
-        <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+        <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
         <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
         <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     </properties>
@@ -87,7 +87,7 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>mdsal-artifacts</artifactId>
-              <version>${mdsal.version}</version>
+              <version>${controller.mdsal.version}</version>
               <scope>import</scope>
               <type>pom</type>
             </dependency>