Repository: camel Updated Branches: refs/heads/master 6a9c07cad -> 7253ae98f
CAMEL-9464: Camel-chunk: use Chunk-templates bundle in OSGi feature 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/7253ae98 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7253ae98 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7253ae98 Branch: refs/heads/master Commit: 7253ae98ffe98042733ec243bd3535e9270b8d7c Parents: 6a9c07c Author: Andrea Cosentino <[email protected]> Authored: Fri Jan 8 15:35:04 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Fri Jan 8 15:35:04 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 ++ platforms/karaf/features/src/main/resources/features.xml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7253ae98/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2cef0c0..281388a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -90,6 +90,7 @@ <cglib-bundle-version>3.2.0_1</cglib-bundle-version> <cglib-version>3.2.0</cglib-version> <chunk-templates-version>3.1.3</chunk-templates-version> + <chunk-templates-bundle-version>3.1.3_1</chunk-templates-bundle-version> <classmate-version>1.3.1</classmate-version> <cmis-version>0.13.0</cmis-version> <cometd-bayeux-version>6.1.11</cometd-bayeux-version> @@ -313,6 +314,7 @@ <jsonlib-version>2.4</jsonlib-version> <json4s-bundle-version>3.2.8_1</json4s-bundle-version> <json-asm-version>1.0.2</json-asm-version> + <json-accessors-smart-version>1.1</json-accessors-smart-version> <json-path-version>2.1.0</json-path-version> <json-simple-version>1.1.1</json-simple-version> <json-smart-version>2.2.1</json-smart-version> http://git-wip-us.apache.org/repos/asf/camel/blob/7253ae98/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 daef3e9..125084c 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -264,7 +264,9 @@ <feature name='camel-chunk' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle> - <bundle dependency='true'>wrap:mvn:com.x5dev/chunk-templates/${chunk-templates-version}</bundle> + <bundle dependency='true'>mvn:net.minidev/json-smart/${json-smart-version}</bundle> + <bundle dependency='true'>mvn:net.minidev/accessors-smart/${json-accessors-smart-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.chunk-templates/${chunk-templates-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-chunk/${project.version}</bundle> </feature> <feature name='camel-cmis' version='${project.version}' resolver='(obr)' start-level='50'>
