You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/09/05 09:06:41 UTC
karaf-cellar git commit: [KARAF-4256] Use condition in Cellar features
Repository: karaf-cellar
Updated Branches:
refs/heads/master 17e45594c -> 74b96dd46
[KARAF-4256] Use condition in Cellar features
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/74b96dd4
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/74b96dd4
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/74b96dd4
Branch: refs/heads/master
Commit: 74b96dd46be3cb25f9a339cbf444c7d46576bee1
Parents: 17e4559
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Mon Sep 5 11:06:12 2016 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Mon Sep 5 11:06:12 2016 +0200
----------------------------------------------------------------------
assembly/src/main/resources/features.xml | 64 +++++++++++++++++----------
pom.xml | 2 +-
2 files changed, 41 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74b96dd4/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index de63be2..b473af3 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -41,27 +41,35 @@
</feature>
<feature name="cellar-config" description="ConfigAdmin cluster support" version="${project.version}">
- <feature>config</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.config/${project.version}</bundle>
+ <conditional>
+ <condition>config</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.config/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar-features" description="Karaf features cluster support" version="${project.version}">
- <feature>feature</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.features/${project.version}</bundle>
+ <conditional>
+ <condition>feature</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.features/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar-bundle" description="Bundle cluster support" version="${project.version}">
- <feature>bundle</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle>
+ <conditional>
+ <condition>bundle</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar-shell" description="Cellar shell support" version="${project.version}">
- <feature>shell</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.shell/${project.version}</bundle>
+ <conditional>
+ <condition>shell</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.shell/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar" description="Karaf clustering" version="${project.version}">
@@ -78,15 +86,19 @@
</feature>
<feature name="cellar-obr" description="OBR cluster support" version="${project.version}">
- <feature>obr</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.obr/${project.version}</bundle>
+ <conditional>
+ <condition>obr</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.obr/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar-eventadmin" description="OSGi events broadcasting in clusters" version="${project.version}">
- <feature>eventadmin</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.event/${project.version}</bundle>
+ <conditional>
+ <condition>eventadmin</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.event/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar-cloud" description="Cloud blobstore support in clusters" version="${project.version}">
@@ -115,9 +127,11 @@
</feature>
<feature name="cellar-webconsole" description="Cellar plugin for Karaf WebConsole" version="${project.version}">
- <feature>webconsole</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.webconsole/${project.version}</bundle>
+ <conditional>
+ <condition>webconsole</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.webconsole/${project.version}</bundle>
+ </conditional>
</feature>
<feature name="cellar-http-balancer" description="Cellar HTTP request balancer" version="${project.version}">
@@ -128,9 +142,11 @@
</feature>
<feature name="cellar-log" description="Cellar central log support" version="${project.version}">
- <feature>log</feature>
- <feature>cellar-hazelcast</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.log/${project.version}</bundle>
+ <conditional>
+ <condition>log</condition>
+ <feature>cellar-hazelcast</feature>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.log/${project.version}</bundle>
+ </conditional>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/74b96dd4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 68d65a0..d718dc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<jclouds.version>1.9.1</jclouds.version>
<joda-time.version>2.9.1</joda-time.version>
<junit.version>4.11</junit.version>
- <karaf.version>4.0.3</karaf.version>
+ <karaf.version>4.0.6</karaf.version>
<osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<slf4j.version>1.7.7</slf4j.version>