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:45 UTC
[1/2] camel git commit: Upgrade Dropbox to version 1.8.1
Repository: camel
Updated Branches:
refs/heads/master ba631d53c -> 0b5c2980d
Upgrade Dropbox to version 1.8.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9071eb43
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9071eb43
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9071eb43
Branch: refs/heads/master
Commit: 9071eb43cd5a7386b5fa9f82115aca93fd15299a
Parents: ba631d5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Sun Sep 27 10:13:18 2015 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Sun Sep 27 10:13:18 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9071eb43/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d8bcdf..ebb24dc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -137,7 +137,7 @@
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>5.5.1</dozer-version>
<drools-version>6.2.0.Final</drools-version>
- <dropbox-version>1.7.7</dropbox-version>
+ <dropbox-version>1.8.1</dropbox-version>
<easymock-version>3.2</easymock-version>
<eclipse-compiler-version>4.2.2</eclipse-compiler-version>
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
[2/2] camel git commit: Updated Camel-dropbox feature with new
required dependencies (squareup-okhttp and squareup-okio)
Posted by ac...@apache.org.
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'>