Switch to using {{VERSION}} in features.xml

The recommended way to define versions in the features.xml file is to use {{VERSION} instead of properties. See [1] for a recent thread on the topic. For now only the <bundle> and <configfile> tags are supported [2].

[1] https://lists.opendaylight.org/pipermail/controller-dev/2015-October/010674.html
[2] https://git.opendaylight.org/gerrit/gitweb?p=odlparent.git;a=blob;f=features-parent/pom.xml;h=08c06730f5455b2555dfccf292e2a27bedccf01e;hb=HEAD#l76

Change-Id: I3819397cb3a1290c0f2c4f8b1ea190e330f46f79
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 41026ead2607c4be5339b25680df257dcf8dba29..4b9fe8a33ad8c0e712291eddce3acd8045b91f3a 100755 (executable)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -10,11 +10,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <features name="odl-unimgr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
 
   <feature name='odl-unimgr-api' version='${project.version}' description='OpenDaylight :: VCPE :: api'>
     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
@@ -25,13 +25,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
     <feature version='${project.version}'>odl-unimgr-api</feature>
-    <bundle>mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/unimgr.xml">mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.unimgr/unimgr-impl/{{VERSION}}</bundle>
+    <configfile finalname="${configfile.directory}/unimgr.xml">mvn:org.opendaylight.unimgr/unimgr-impl/{{VERSION}}/xml/config</configfile>
   </feature>
 
   <feature name='odl-unimgr-console' version='${project.version}' description='OpenDaylight :: VCPE :: CLI'>
       <feature version="${project.version}">odl-unimgr</feature>
-      <bundle>mvn:org.opendaylight.unimgr/unimgr-cli/${project.version}</bundle>
+      <bundle>mvn:org.opendaylight.unimgr/unimgr-cli/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-unimgr-rest' version='${project.version}' description='OpenDaylight :: VCPE :: REST'>