Repository: jclouds-karaf
Updated Branches:
refs/heads/1.8.x 4ff123910 -> 589bd0881
Downgrade guava to be in sync with 1.8.2-SNAPSHOT bundles
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/commit/0ac0bab2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/tree/0ac0bab2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-karaf/diff/0ac0bab2
Branch: refs/heads/1.8.x
Commit: 0ac0bab244d0ff9c8e324ecce5e50a62a33f3770
Parents: 4ff1239
Author: Chris Custine <[email protected]>
Authored: Thu Oct 30 03:04:21 2014 -0600
Committer: Ignasi Barrera <[email protected]>
Committed: Thu Oct 30 14:24:58 2014 +0100
----------------------------------------------------------------------
.../org/jclouds/karaf/commands/blobstore/BlobReadCommand.java | 4 +++-
pom.xml | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/0ac0bab2/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
----------------------------------------------------------------------
diff --git
a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
index 6912445..938bf12 100644
---
a/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
+++
b/commands/src/main/java/org/jclouds/karaf/commands/blobstore/BlobReadCommand.java
@@ -17,6 +17,8 @@
package org.jclouds.karaf.commands.blobstore;
+import static org.jclouds.util.Closeables2.closeQuietly;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -74,7 +76,7 @@ public class BlobReadCommand extends
BlobStoreCommandWithOptions {
Files.asByteSink(file).writeFrom(is);
}
} finally {
- Closeables.closeQuietly(is);
+ closeQuietly(is);
}
return null;
http://git-wip-us.apache.org/repos/asf/jclouds-karaf/blob/0ac0bab2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5f4f1d2..136d5d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,8 +187,8 @@ limitations under the License.
<easymock.version>3.0</easymock.version>
<felix.configadmin.version>1.2.8</felix.configadmin.version>
<groovy.version>1.8.6</groovy.version>
- <gson.version>2.2.2</gson.version>
- <guava.version>17.0</guava.version>
+ <gson.version>2.2.4</gson.version>
+ <guava.version>16.0.1</guava.version>
<guava.test.version>10.0</guava.test.version>
<guice.version>3.0</guice.version>
<httpclient.version>4.1.1</httpclient.version>