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/03/01 11:48:03 UTC
[6/6] camel git commit: Get stuff work with OSGi
Get stuff work with OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df4a9413
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df4a9413
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df4a9413
Branch: refs/heads/master
Commit: df4a9413ec5a18ac58a1d91ea3ec701d75e04091
Parents: ed62696
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 1 11:49:00 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 1 11:49:00 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 7 ++++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/df4a9413/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ffaa2e9..c3eb356 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -527,7 +527,6 @@
org.eclipse.jetty.*;version="[8.0,10)",
com.thoughtworks.xstream.*;version="[1.3,2)",
org.antlr.stringtemplate.*;version="[3.0,4)",
- org.jivesoftware.smack.*;version="[3.0,4)",
org.ccil.cowan.tagsoup.*;version="[1.2,2)",
org.mortbay.cometd.*;version="[6.1,7)",
org.slf4j.*;version="[1.6,2)",
http://git-wip-us.apache.org/repos/asf/camel/blob/df4a9413/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 f089606..7bf0838 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1548,9 +1548,9 @@
</feature>
<feature name='camel-xmpp' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-extensions/${smack-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-core/${smack-version}</bundle>
+ <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-tcp/${smack-version}</bundle>
+ <bundle dependency='true'>mvn:org.igniterealtime.smack/smack-extensions/${smack-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-xmpp/${project.version}</bundle>
</feature>
@@ -1569,6 +1569,7 @@
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scribe/${scribe-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-yammer/${project.version}</bundle>
</feature>