You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/02/28 10:05:20 UTC
[3/3] camel git commit: Make camel-ganglia install in osgi.
Make camel-ganglia install in osgi.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/392ea184
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/392ea184
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/392ea184
Branch: refs/heads/master
Commit: 392ea184591a3ec4b4ed0ae170fddecd0103d06c
Parents: 6bc2915
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 28 10:04:02 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 28 10:04:02 2015 +0100
----------------------------------------------------------------------
components/camel-ganglia/pom.xml | 3 +++
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/392ea184/components/camel-ganglia/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index 02a2ecc..232e91b 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -30,6 +30,9 @@
<description>Camel Ganglia support</description>
<properties>
+ <camel.osgi.import.before.defaults>
+ info.ganglia.gmetric4j.*;version="[0,2)"
+ </camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>
org.apache.camel.component.ganglia.*
</camel.osgi.export.pkg>
http://git-wip-us.apache.org/repos/asf/camel/blob/392ea184/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 17516de..628d50c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -177,6 +177,7 @@
<geronimo-servlet-spec-version>1.0</geronimo-servlet-spec-version>
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmaven-plugin-version>1.4</gmaven-plugin-version>
+ <gmetric4j-bundle-version>1.0.7</gmetric4j-bundle-version>
<gmetric4j-version>1.0.9</gmetric4j-version>
<google-app-engine-version>1.8.3</google-app-engine-version>
<google-app-engine-bundle-version>1.8.3_1</google-app-engine-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/392ea184/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 7ebc790..27d60d6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -415,7 +415,7 @@
<feature name='camel-ganglia' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.acplt.remotetea/remotetea-oncrpc/${oncrpc-version}</bundle>
- <bundle dependency='true'>mvn:info.ganglia.gmetric4j/gmetric4j/${gmetric4j-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:info.ganglia.gmetric4j/gmetric4j/${gmetric4j-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-ganglia/${project.version}</bundle>
</feature>
<feature name='camel-geocoder' version='${project.version}' resolver='(obr)' start-level='50'>