Fix changed version

Inadvertently changed version while cleaning up features.
This reverts it.

Change-Id: Id273a7feaf82d08a6be105b591b195e2fef7cbd6
Signed-off-by: Tomas Cere <tcere@cisco.com>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index 6925ddd3827178a781323c0ac9b6ae99e00e3da4..9d24f37e543de15a7134445937adc614b7f91f74 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -16,7 +16,7 @@
   <properties>
     <aaa.version>0.3.0-SNAPSHOT</aaa.version>
     <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.sal.version>1.3.0-SNAPSHOT</controller.sal.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
     <config.version>0.4.0-SNAPSHOT</config.version>
     <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
     <features.test.version>1.6.0-SNAPSHOT</features.test.version>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.sal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index 13ccf485d1ac6ac26f52906cc43355a4fecc23f5..9a123722831d041fd961c64cb03aa71288182e11 100644 (file)
--- a/features/netconf/src/main/features/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -132,14 +132,14 @@
     <bundle>mvn:org.opendaylight.netconf/netconf-tcp/{{VERSION}}</bundle>
   </feature>
 
-  <feature name='odl-netconf-mdsal' version='${project.version}' description="OpenDaylight :: Netconf :: Mdsal">
+  <feature name='odl-netconf-mdsal' version='${controller.mdsal.version}' description="OpenDaylight :: Netconf :: Mdsal">
     <feature version='${config.version}'>odl-config-all</feature>
     <feature version='${config.version}'>odl-config-netty</feature>
     <feature version='${project.version}'>odl-netconf-all</feature>
     <feature version='${project.version}'>odl-netconf-tcp</feature>
     <feature version='${project.version}'>odl-netconf-ssh</feature>
     <feature version='${project.version}'>odl-netconf-client</feature>
-    <feature version='${controller.sal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-notification/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-connector/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netconf/mdsal-netconf-monitoring/{{VERSION}}</bundle>