UNOMI-116 : Fixed hardcoded version numbers in features

Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/514eac0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/514eac0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/514eac0c

Branch: refs/heads/feature-UNOMI-117
Commit: 514eac0c3042de5bd78e01a1f3797f7f9a0fe9b3
Parents: 3af0554
Author: Thomas Draier <[email protected]>
Authored: Wed Aug 30 14:10:19 2017 +0200
Committer: Thomas Draier <[email protected]>
Committed: Wed Aug 30 14:10:19 2017 +0200

----------------------------------------------------------------------
 .../karaf-kar/src/main/feature/feature.xml                | 10 +++++-----
 .../weather-update/karaf-kar/src/main/feature/feature.xml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/514eac0c/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git 
a/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml 
b/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
index 5e994e5..1c74c7d 100644
--- a/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/salesforce-connector/karaf-kar/src/main/feature/feature.xml
@@ -16,13 +16,13 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"; 
name="unomi-salesforce-connector-karaf-feature">
-    <feature name="unomi-salesforce-connector-karaf-kar" 
version="1.0-SNAPSHOT" description="Apache Unomi :: Extensions :: Salesforce 
connector :: Apache Karaf Feature">
+    <feature name="unomi-salesforce-connector-karaf-kar" 
version="${project.version}" description="Apache Unomi :: Extensions :: 
Salesforce connector :: Apache Karaf Feature">
         <details>Apache Karaf feature for the Apache Unomi Context Server 
extension that integrates with Salesforce</details>
-        <configfile 
finalname="/etc/org.apache.unomi.sfdc.cfg">mvn:org.apache.unomi/unomi-salesforce-connector-services/1.2.0-incubating-SNAPSHOT/cfg/sfdccfg</configfile>
+        <configfile 
finalname="/etc/org.apache.unomi.sfdc.cfg">mvn:org.apache.unomi/unomi-salesforce-connector-services/${project.version}/cfg/sfdccfg</configfile>
         <bundle 
start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
         <bundle 
start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
-        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-services/1.2.0-incubating-SNAPSHOT</bundle>
-        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-rest/1.2.0-incubating-SNAPSHOT</bundle>
-        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-actions/1.2.0-incubating-SNAPSHOT</bundle>
+        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-services/${project.version}</bundle>
+        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-rest/${project.version}</bundle>
+        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-salesforce-connector-actions/${project.version}</bundle>
     </feature>
 </features>

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/514eac0c/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/extensions/weather-update/karaf-kar/src/main/feature/feature.xml 
b/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
index 80d7adf..2f005a6 100644
--- a/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
+++ b/extensions/weather-update/karaf-kar/src/main/feature/feature.xml
@@ -16,13 +16,13 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"; 
name="unomi-weather-update-karaf-feature">
-    <feature name="unomi-weather-update-karaf-kar" version="1.0-SNAPSHOT"
+    <feature name="unomi-weather-update-karaf-kar" version="${project.version}"
              description="Apache Unomi :: Extensions :: Weather update :: 
Apache Karaf Feature">
         <details>Apache Karaf feature for the Apache Unomi Context Server 
extension that integrates Weather
             update</details>
-        <configfile 
finalname="/etc/org.apache.unomi.weatherUpdate.cfg">mvn:org.apache.unomi/unomi-weather-update-core/1.2.0-incubating-SNAPSHOT/cfg/weatherupdatecfg</configfile>
+        <configfile 
finalname="/etc/org.apache.unomi.weatherUpdate.cfg">mvn:org.apache.unomi/unomi-weather-update-core/${project.version}/cfg/weatherupdatecfg</configfile>
         <bundle 
start-level="85">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
         <bundle 
start-level="85">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
-        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-weather-update-core/1.2.0-incubating-SNAPSHOT</bundle>
+        <bundle 
start-level="85">mvn:org.apache.unomi/unomi-weather-update-core/${project.version}</bundle>
     </feature>
 </features>

Reply via email to