You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/05/18 15:09:56 UTC
[2/2] karaf-decanter git commit: Removing feature version to work
around problem with assembly
Removing feature version to work around problem with assembly
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/bcb6f565
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/bcb6f565
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/bcb6f565
Branch: refs/heads/master
Commit: bcb6f565a526964bf02f4a557739f3f357b90380
Parents: c6182a4
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed May 18 17:08:41 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed May 18 17:09:34 2016 +0200
----------------------------------------------------------------------
assembly/src/main/feature/feature.xml | 46 +++++++++++++++---------------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/bcb6f565/assembly/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/feature/feature.xml b/assembly/src/main/feature/feature.xml
index 532856e..03e25cb 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -27,30 +27,30 @@
</feature>
<feature name="decanter-simple-scheduler" version="${project.version}" description="Karaf Decanter Simple Scheduler">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.scheduler/org.apache.karaf.decanter.scheduler.simple/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.scheduler.simple.cfg">mvn:org.apache.karaf.decanter.scheduler/org.apache.karaf.decanter.scheduler.simple/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-collector-log" version="${project.version}" description="Karaf Decanter Log Messages Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.log/${project.version}</bundle>
</feature>
<feature name="decanter-collector-log-socket" version="${project.version}" description="Karaf Decanter Log4j socket Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.log.socket/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.log.socket.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.log.socket/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-collector-file" version="${project.version}" description="Karaf Decanter Log File Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:commons-io/commons-io/2.4</bundle>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.file/${project.version}</bundle>
</feature>
<feature name="decanter-collector-jmx" version="${project.version}" description="Karaf Decanter JMX Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<feature version="${project.version}">decanter-simple-scheduler</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.jmx/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.jmx-local.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.jmx/${project.version}/cfg/local</configfile>
@@ -67,56 +67,56 @@
</feature>
<feature name="decanter-collector-camel-tracer" version="${project.version}" description="Karaf Decanter Camel Tracer Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.camel-tracer/${project.version}</bundle>
</feature>
<feature name="decanter-collector-rest" version="${project.version}" description="Karaf Decanter REST Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<feature version="${project.version}">decanter-simple-scheduler</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.rest/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.rest-1.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.rest/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-collector-system" version="${project.version}" description="Karaf Decanter OS Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<feature version="${project.version}">decanter-simple-scheduler</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.system/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.system.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.system/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-collector-eventadmin" version="${project.version}" description="Karaf Decanter EventAdmin Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.eventadmin/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.eventadmin-framework.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.eventadmin/${project.version}/cfg/framework</configfile>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.eventadmin-karaf.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.eventadmin/${project.version}/cfg/karaf</configfile>
</feature>
<feature name="decanter-collector-kafka" version="${project.version}" description="Karaf Decanter Kafka Collector">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.9.0.0_1</bundle>
<bundle>mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.kafka/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.collector.kafka.cfg">mvn:org.apache.karaf.decanter.collector/org.apache.karaf.decanter.collector.kafka/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-log" version="${project.version}" description="Karaf Decanter Log Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.log/${project.version}</bundle>
</feature>
<feature name="decanter-appender-elasticsearch" version="${project.version}" description="Karaf Decanter Elasticsearch Native 2.x Appender">
- <feature version="${project.version}">decanter-appender-elasticsearch-native-2.x</feature>
+ <feature>decanter-appender-elasticsearch-native-2.x</feature>
</feature>
<feature name="decanter-appender-elasticsearch-native-1.x" version="${project.version}" description="Karaf Decanter Elasticsearch Native 1.x Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch1.bundle.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch-native-1.x/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.elasticsearch.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch-native-1.x/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-elasticsearch-native-2.x" version="${project.version}" description="Karaf Decanter Elasticsearch Native 2.x Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.elasticsearch/${elasticsearch2.bundle.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch-native-2.x/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.elasticsearch.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch-native-2.x/${project.version}/cfg</configfile>
@@ -124,46 +124,46 @@
<feature name="decanter-appender-elasticsearch-rest" version="${project.version}" description="Karaf Decanter Elasticsearch HTTP REST Appender">
<feature>http</feature>
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch.rest/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.elasticsearch.rest.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.elasticsearch.rest/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-jdbc" version="${project.version}" description="Karaf Decanter JDBC Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.jdbc/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.jdbc.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.jdbc/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-jms" version="${project.version}" description="Karaf Decanter JMS Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<feature>jms</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.jms/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.jms.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.jms/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-camel" version="${project.version}" description="Karaf Decanter Camel Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.camel/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.camel.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.camel/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-kafka" version="${project.version}" description="Karaf Decanter Kafka Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/0.9.0.0_1</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.kafka/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.kafka.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.kafka/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-mqtt" version="${project.version}" description="Karaf Decanter MQTT Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:org.eclipse.paho/org.eclipse.paho.client.mqttv3/${paho.version}</bundle>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.mqtt/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.mqtt.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.mqtt/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-appender-cassandra" version="${project.version}" description="Karaf Decanter Cassandra Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle dependency="true">mvn:com.google.guava/guava/16.0.1</bundle>
<bundle dependency="true">mvn:io.netty/netty-handler/4.0.33.Final</bundle>
<bundle dependency="true">mvn:io.netty/netty-transport-native-epoll/4.0.33.Final</bundle>
@@ -182,13 +182,13 @@
</feature>
<feature name="decanter-appender-redis" version="${project.version}" description="Karaf Decanter Redis Appender">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.redis/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.appender.redis.cfg">mvn:org.apache.karaf.decanter.appender/org.apache.karaf.decanter.appender.redis/${project.version}/cfg</configfile>
</feature>
<feature name="decanter-sla" version="${project.version}" description="Karaf Decanter SLA support">
- <feature version="${project.version}">decanter-common</feature>
+ <feature>decanter-common</feature>
<bundle>mvn:org.apache.karaf.decanter.sla/org.apache.karaf.decanter.sla.checker/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.decanter.sla.checker.cfg">mvn:org.apache.karaf.decanter.sla/org.apache.karaf.decanter.sla.checker/${project.version}/cfg</configfile>
</feature>