Repository: camel Updated Branches: refs/heads/master d9b85ceff -> f67f27303
[CAMEL-8661] Use managed version of jackrabbit libs in camel-hbase and camel-hdfs2 features Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f67f2730 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f67f2730 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f67f2730 Branch: refs/heads/master Commit: f67f27303d4e28198658d1fa97d86cfd91b529e2 Parents: d9b85ce Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Fri Apr 17 16:59:42 2015 +0200 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Fri Apr 17 16:59:48 2015 +0200 ---------------------------------------------------------------------- platforms/karaf/features/src/main/resources/features.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f67f2730/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 24bc5e2..d05993c 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -568,8 +568,8 @@ <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: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.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle> + <bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-vfs2/${commons-vfs2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle> @@ -619,8 +619,8 @@ <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: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.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle> + <bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-jexl/${commons-jexl2-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-vfs2/${commons-vfs2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>