Repository: camel Updated Branches: refs/heads/master fe6d6b063 -> 930117ca6
Upgrade Jackrabbit to version 2.11.3. Added a specific property for Jackrabbit Guava version used. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/930117ca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/930117ca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/930117ca Branch: refs/heads/master Commit: 930117ca6652c4f68c73f7e224ad2c81d104fd3c Parents: fe6d6b0 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Dec 11 12:09:04 2015 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Dec 11 12:09:46 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/930117ca/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f12a3c5..6a12f1d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -242,7 +242,8 @@ <jackson-version>1.9.12</jackson-version> <jackson2-scala-version>2.6.1</jackson2-scala-version> <jackson2-version>2.6.3</jackson2-version> - <jackrabbit-version>2.11.2</jackrabbit-version> + <jackrabbit-version>2.11.3</jackrabbit-version> + <jackrabbit-guava-version>15.0</jackrabbit-guava-version> <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version> <jasper-bundle-version>6.0.44_1</jasper-bundle-version> <jasypt-bundle-version>1.9.2_1</jasypt-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/930117ca/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 b35aeef..81c7fce 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -788,6 +788,7 @@ <feature name='camel-jcr' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:javax.jcr/jcr/${jcr-version}</bundle> <bundle dependency='true'>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${jackrabbit-guava-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-jcr/${project.version}</bundle> </feature>
