Fix sal-netconf-connector feature version

Make sal-netconf-connector preserve md-sal version.
Make features-netconf-connector inherit netconf project version

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

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 9899752e4cce1883b1205d02154645f60425b33a..2b0bf7d0fef8225d45d07764e09f2c04d1e000fe 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -15,8 +15,6 @@
     </parent>
    <artifactId>features-netconf-connector</artifactId>
 
-    <!-- Preserve mdsal version-->
-   <version>${mdsal.version}</version>
    <packaging>jar</packaging>
    <properties>
       <features.file>features.xml</features.file>

diff --git a/features/netconf-connector/src/main/resources/features.xml b/features/netconf-connector/src/main/resources/features.xml
index ac272fa8db0373c527e2a5b408ea05b29e595229..dd6d60541f958e48edc4cea1dea574b43e9eb1fa 100644 (file)
--- a/features/netconf-connector/src/main/resources/features.xml
+++ b/features/netconf-connector/src/main/resources/features.xml
@@ -31,7 +31,7 @@
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${netconf.version}'>odl-netconf-client</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:org.opendaylight.netconf/sal-netconf-connector/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.netconf/sal-netconf-connector/${mdsal.version}</bundle>
         <bundle>mvn:org.opendaylight.controller.model/model-inventory/${mdsal.version}</bundle>
     </feature>