You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/04/03 17:49:40 UTC
[1/2] camel git commit: CAMEL-8579 Upgrade to jclouds 1.9.x
Repository: camel
Updated Branches:
refs/heads/master 9ff05dc66 -> ff38d130a
CAMEL-8579 Upgrade to jclouds 1.9.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0f18a3fa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0f18a3fa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0f18a3fa
Branch: refs/heads/master
Commit: 0f18a3fa333111694cb1ba4a61176b0436931fc0
Parents: 9ff05dc
Author: ancosen <an...@gmail.com>
Authored: Fri Apr 3 10:23:32 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 3 17:33:57 2015 +0200
----------------------------------------------------------------------
.../camel/component/jclouds/JcloudsPayloadConverter.java | 9 +++++++--
parent/pom.xml | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0f18a3fa/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
index 7f3b4ef..c2ee88b 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
@@ -103,11 +103,16 @@ public final class JcloudsPayloadConverter {
}
@Converter
- public static Payload toPayload(InputStream is, Exchange exchange) throws IOException {
+ public static Payload toPayload(final InputStream is, Exchange exchange) throws IOException {
InputStreamPayload payload = new InputStreamPayload(is);
// only set the contentlength if possible
if (is.markSupported()) {
- long contentLength = ByteStreams.length(payload);
+ long contentLength = ByteStreams.length(new InputSupplier<InputStream>() {
+ @Override
+ public InputStream getInput() throws IOException {
+ return is;
+ }
+ });
is.reset();
payload.getContentMetadata().setContentLength(contentLength);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/0f18a3fa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5bc200b2..d6bd994 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -248,7 +248,7 @@
<jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
<jboss-logging-version>3.1.4.GA</jboss-logging-version>
<jboss-marshalling-version>1.3.18.GA</jboss-marshalling-version>
- <jclouds-version>1.8.1</jclouds-version>
+ <jclouds-version>1.9.0</jclouds-version>
<!-- jclouds must use this guava version -->
<jclouds-google-guava-version>17.0</jclouds-google-guava-version>
<jcr-version>2.0</jcr-version>
[2/2] camel git commit: CAMEL-8579: And make jclouds upgrade work in
OSGi
Posted by da...@apache.org.
CAMEL-8579: And make jclouds upgrade work in OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff38d130
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff38d130
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff38d130
Branch: refs/heads/master
Commit: ff38d130a1b46400d6d306a8fb0a64dde7de9d91
Parents: 0f18a3f
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 3 17:52:08 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 3 17:52:08 2015 +0200
----------------------------------------------------------------------
components/camel-jclouds/pom.xml | 4 ++++
parent/pom.xml | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ff38d130/components/camel-jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 57cac3b..21fec12 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -32,6 +32,10 @@
<description>Camel JClouds support</description>
<properties>
+ <camel.osgi.import.before.defaults>
+ com.google.common.*;version="${jclouds-google-guava-version-range}",
+ </camel.osgi.import.before.defaults>
+
<camel.osgi.export.pkg>org.apache.camel.component.jclouds.*</camel.osgi.export.pkg>
<camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=jclouds</camel.osgi.export.service>
<google-guava-version>${jclouds-google-guava-version}</google-guava-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/ff38d130/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d6bd994..632751c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -250,7 +250,8 @@
<jboss-marshalling-version>1.3.18.GA</jboss-marshalling-version>
<jclouds-version>1.9.0</jclouds-version>
<!-- jclouds must use this guava version -->
- <jclouds-google-guava-version>17.0</jclouds-google-guava-version>
+ <jclouds-google-guava-version>16.0</jclouds-google-guava-version>
+ <jclouds-google-guava-version-range>[16.0,17.0)</jclouds-google-guava-version-range>
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jdom-version>1.1.3</jdom-version>