Repository: camel Updated Branches: refs/heads/master e9f3f60d2 -> b500eb4a9
CAMEL-9494: Camel-Facebook: Use the OSGi bundle instead of wrapping the jar Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b500eb4a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b500eb4a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b500eb4a Branch: refs/heads/master Commit: b500eb4a9c3a52f8ce368ae4aecb30be22a6d4a7 Parents: e9f3f60 Author: Andrea Cosentino <anco...@gmail.com> Authored: Sat Jan 9 13:56:03 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Sat Jan 9 13:56:37 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b500eb4a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 63e8459..14e84d5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -158,6 +158,7 @@ <exec-maven-plugin-version>1.4.0</exec-maven-plugin-version> <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version> <facebook4j-core-version>2.4.1</facebook4j-core-version> + <facebook4j-core-bundle-version>2.4.1_1</facebook4j-core-bundle-version> <fastinfoset-version>1.2.13_1</fastinfoset-version> <felix-configadmin-version>1.8.8</felix-configadmin-version> <felix-connect-version>0.1.0</felix-connect-version> http://git-wip-us.apache.org/repos/asf/camel/blob/b500eb4a/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 125084c..bf6e80d 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -420,7 +420,7 @@ </feature> <feature name='camel-facebook' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>wrap:mvn:org.facebook4j/facebook4j-core/${facebook4j-core-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.facebook4j/${facebook4j-core-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-facebook/${project.version}</bundle> </feature> <feature name='camel-flatpack' version='${project.version}' resolver='(obr)' start-level='50'>
