You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/03/24 07:44:58 UTC
[3/3] camel git commit: Using JCR API 2.0 jar directly in Apache
Camel feature
Using JCR API 2.0 jar directly in Apache Camel feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a2e92d4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a2e92d4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a2e92d4
Branch: refs/heads/camel-2.14.x
Commit: 1a2e92d4c84d8bf6bfdce0975604b33c0aac9279
Parents: 784580b
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Mar 24 14:41:16 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Mar 24 14:44:39 2015 +0800
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1a2e92d4/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 de3268c..e7a846e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -486,7 +486,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hbase/${project.version}</bundle>
<!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration and hbase, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
@@ -535,7 +535,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-hdfs/${project.version}</bundle>
<!-- the following bundles can be removed when osgi metadata is fixed in commons-configuration, to have resolution=:option on packages that are optional -->
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/2.5.2</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle>
@@ -657,7 +657,7 @@
<bundle>mvn:org.apache.camel/camel-jclouds/${project.version}</bundle>
</feature>
<feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jcr-api-2.0/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle>
<bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jcr/${project.version}</bundle>