Use the Fastjson bundle for the camel-fastjson Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51770d71 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51770d71 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51770d71 Branch: refs/heads/master Commit: 51770d7151edaa5c47194dcae9d2833db5f50650 Parents: 84dd697 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Aug 1 08:49:10 2017 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Aug 1 08:49:10 2017 +0200 ---------------------------------------------------------------------- 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/51770d71/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 162ee82..1713428 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -212,6 +212,7 @@ <facebook4j-core-bundle-version>2.4.10_1</facebook4j-core-bundle-version> <fastinfoset-version>1.2.13_1</fastinfoset-version> <fastjson-version>1.2.35</fastjson-version> + <fastjson-bundle-version>1.2.35_1</fastjson-bundle-version> <felix-configadmin-version>1.8.8</felix-configadmin-version> <felix-connect-version>0.1.0</felix-connect-version> <felix-fileinstall-version>3.5.2</felix-fileinstall-version> http://git-wip-us.apache.org/repos/asf/camel/blob/51770d71/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 0608a40..f0a76c4 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -617,7 +617,7 @@ </feature> <feature name='camel-fastjson' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>wrap:mvn:com.alibaba/fastjson/${fastjson-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastjson/${fastjson-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-fastjson/${project.version}</bundle> </feature> <feature name='camel-flatpack' version='${project.version}' resolver='(obr)' start-level='50'>
