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: I9571969998a04a0fdae65eb61ffab414b45ee60d
Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>

diff --git a/features/production/pom.xml b/features/production/pom.xml
index 5525b123a6ba8d5d96dababdcdea3cabe46e4e35..a5397fbde85da4fecf816c1148a35c57cbc58902 100644 (file)
--- a/features/production/pom.xml
+++ b/features/production/pom.xml
@@ -14,7 +14,7 @@
   <properties>
       <aaa.version>0.4.0-SNAPSHOT</aaa.version>
       <yangtools.version>1.0.0-SNAPSHOT</yangtools.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>
       <restconf.version>1.4.0-SNAPSHOT</restconf.version>
   </properties>
@@ -31,7 +31,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/production/src/main/features/features.xml b/features/production/src/main/features/features.xml
index cb2f199890a152778b8da722a685609123297528..d449ca1af699eea218386df89b0ef7f7a0ff193a 100644 (file)
--- a/features/production/src/main/features/features.xml
+++ b/features/production/src/main/features/features.xml
@@ -37,7 +37,7 @@
   <feature name='odl-neutron-transcriber' version='${project.version}' description="OpenDaylight :: Neutron :: Implementation">
     <feature version='${project.version}'>odl-neutron-spi</feature>
     <feature>war</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <bundle>mvn:org.opendaylight.neutron/transcriber/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>