Repository: camel Updated Branches: refs/heads/master 618404fd6 -> e18fb8c6f
Use OkHttp and Okio bundle where possible Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e18fb8c6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e18fb8c6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e18fb8c6 Branch: refs/heads/master Commit: e18fb8c6fbb95909dc42d8b2abf08d964b00ec25 Parents: 618404f Author: Andrea Cosentino <[email protected]> Authored: Mon Aug 8 10:44:42 2016 +0200 Committer: Andrea Cosentino <[email protected]> Committed: Mon Aug 8 10:44:42 2016 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 ++ platforms/karaf/features/src/main/resources/features.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e18fb8c6/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a8cb215..927e401 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -564,7 +564,9 @@ <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! --> <spymemcached-version>2.12.0</spymemcached-version> <squareup-okhttp-version>2.7.5</squareup-okhttp-version> + <squareup-okhttp-bundle-version>2.7.5_1</squareup-okhttp-bundle-version> <squareup-okio-version>1.9.0</squareup-okio-version> + <squareup-okio-bundle-version>1.9.0_1</squareup-okio-bundle-version> <sshd-version>0.14.0</sshd-version> <stompjms-version>1.19</stompjms-version> <swagger-scala-version>1.3.12</swagger-scala-version> http://git-wip-us.apache.org/repos/asf/camel/blob/e18fb8c6/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 a0834b7..4332102 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -431,8 +431,8 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> <bundle dependency='true'>wrap:mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version}</bundle> - <bundle dependency='true'>wrap:mvn:com.squareup.okhttp/okhttp/${squareup-okhttp-version}</bundle> - <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio/${squareup-okio-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${squareup-okhttp-bundle-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-dropbox/${project.version}</bundle> </feature> <feature name='camel-ehcache' version='${project.version}' resolver='(obr)' start-level='50'>
