You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/09/27 10:31:46 UTC

[2/2] camel git commit: Updated Camel-dropbox feature with new required dependencies (squareup-okhttp and squareup-okio)

Updated Camel-dropbox feature with new required dependencies (squareup-okhttp and squareup-okio)


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b5c2980
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b5c2980
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b5c2980

Branch: refs/heads/master
Commit: 0b5c2980d92647816a409187285408076576c841
Parents: 9071eb4
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Sep 27 10:29:36 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Sep 27 10:29:36 2015 +0200

----------------------------------------------------------------------
 parent/pom.xml                                           | 2 ++
 platforms/karaf/features/src/main/resources/features.xml | 2 ++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0b5c2980/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ebb24dc..c6fda1d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -479,6 +479,8 @@
     <spring-ws-version>2.2.1.RELEASE</spring-ws-version>
     <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
     <spymemcached-version>2.8.4</spymemcached-version>
+    <squareup-okhttp-version>2.5.0</squareup-okhttp-version>
+    <squareup-okio-version>1.6.0</squareup-okio-version>
     <sshd-version>0.14.0</sshd-version>
     <stompjms-version>1.19</stompjms-version>
     <swagger-version>1.3.12</swagger-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/0b5c2980/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 2939222..e762442 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -377,6 +377,8 @@
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
     <bundle dependency="true">wrap:mvn:javax.servlet/servlet-api/2.5</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>mvn:org.apache.camel/camel-dropbox/${project.version}</bundle>
   </feature>
   <feature name='camel-elasticsearch' version='${project.version}' resolver='(obr)' start-level='50'>