Repository: camel Updated Branches: refs/heads/master ff85c44b8 -> a23351a8c
CAMEL-9615 camel-itest-karaf - Some failed tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a23351a8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a23351a8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a23351a8 Branch: refs/heads/master Commit: a23351a8cb7004452f1536e857e73c63e7d383fb Parents: ff85c44 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Feb 18 14:44:47 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Feb 18 14:44:47 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a23351a8/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d405087..45adbde 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -363,6 +363,7 @@ <lucene-version>5.4.1</lucene-version> <lucene-version-range>[5,6)</lucene-version-range> <lightcouch-version>0.1.8</lightcouch-version> + <lightcouch-gson-version>2.3.1</lightcouch-gson-version> <lightcouch-bundle-version>0.1.8_2</lightcouch-bundle-version> <!-- needed from tooling/archetypes --> <!-- use antrun 1.6 as 1.7 fails with finding tools.jar on java on some platforms --> http://git-wip-us.apache.org/repos/asf/camel/blob/a23351a8/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 395f9fe..ea57b0a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -302,7 +302,7 @@ <feature name='camel-couchdb' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lightcouch/${lightcouch-bundle-version}</bundle> - <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${lightcouch-gson-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> @@ -496,7 +496,7 @@ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle> <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle> - <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle> <bundle dependency='true'>wrap:mvn:com.google.code.geocoder-java/geocoder-java/${geocoder-java-version}</bundle> <bundle>mvn:org.apache.camel/camel-geocoder/${project.version}</bundle> </feature> @@ -568,7 +568,7 @@ <bundle>mvn:org.apache.camel/camel-groovy/${project.version}</bundle> </feature> <feature name='camel-gson' version='${project.version}' resolver='(obr)' start-level='50'> - <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-gson/${project.version}</bundle> </feature> @@ -907,7 +907,7 @@ <bundle>mvn:net.minidev/json-smart/${json-smart-version}</bundle> <bundle>mvn:net.minidev/accessors-smart/${json-accessors-smart-version}</bundle> <!-- should be optional: https://code.google.com/p/json-path/issues/detail?id=66 --> - <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> @@ -1146,7 +1146,7 @@ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle> <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle> <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> - <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle> + <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle> <bundle dependency='true'>mvn:org.apache.olingo/olingo-odata2-api/${olingo2-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.olingo-odata2-core/${olingo-odata2-core-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle>
