Repository: camel Updated Branches: refs/heads/camel-2.15.x 3c45d3726 -> c9191f801
[CAMEL-8661] Use managed version of jackrabbit libs in camel-hbase and camel-hdfs2 features (cherry picked from commit f67f27303d4e28198658d1fa97d86cfd91b529e2) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9191f80 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9191f80 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9191f80 Branch: refs/heads/camel-2.15.x Commit: c9191f801169ee7795ad64159595b91c527c6fdf Parents: 3c45d37 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 17:01:09 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/c9191f80/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 57bd4ca..831c484 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -563,8 +563,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> @@ -614,8 +614,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>
