Repository: camel Updated Branches: refs/heads/camel-2.14.x e6cca31dd -> 1a2e92d4c refs/heads/camel-2.15.x db0689c41 -> 4969ed91b
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/4969ed91 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4969ed91 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4969ed91 Branch: refs/heads/camel-2.15.x Commit: 4969ed91b532da07b161962fa812f80c81ad46bf Parents: db0689c Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Mar 24 14:41:16 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Mar 24 14:43:51 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/4969ed91/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 eccdb34..ad099ad 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -560,7 +560,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> @@ -609,7 +609,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> @@ -741,7 +741,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>