Repository: camel
Updated Branches:
refs/heads/camel-2.14.x a3ae12f29 -> 717c62c8b
CAMEL-8296: Fixed camel-box feature
Conflicts:
platforms/karaf/features/src/main/resources/features.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/717c62c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/717c62c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/717c62c8
Branch: refs/heads/camel-2.14.x
Commit: 717c62c8bbaad011d278ced186f84e8803d3f79c
Parents: a3ae12f
Author: Claus Ibsen <davscl...@apache.org>
Authored: Mon Feb 2 10:06:09 2015 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Mon Feb 2 10:07:30 2015 +0100
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/717c62c8/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 a2d1344..4e24704 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -178,8 +178,9 @@
<bundle
dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpmime/${httpclient4-version}$Export-Package=org.apache.http.*;version=${httpclient4-version}</bundle>
+ <!-- we need commons lang 2.x and 3.x -->
<bundle
dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
- <!--bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle-->
+ <bundle
dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
@@ -190,17 +191,14 @@
<bundle
dependency='true'>wrap:mvn:net.sourceforge.cssparser/cssparser/0.9.14</bundle>
<bundle dependency='true'>wrap:mvn:org.w3c.css/sac/1.3</bundle>
<bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
- <!-- These bundles are endorse lib in karaf
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
- -->
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle
dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle
dependency='true'>wrap:mvn:net.sourceforge.nekohtml/nekohtml/1.9.21</bundle>
-
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<feature>jetty</feature>
-</feature>
+ </feature>
<feature name='camel-cache' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
