From 1376cd79ed118adae5ea321f3f61c2436df0b209 Mon Sep 17 00:00:00 2001
From: David Horwitz <dhorwitz@gmail.com>
Date: Wed, 4 Dec 2019 15:54:40 +0200
Subject: [PATCH] SAK-42857 Update Apache jclouds 2.2.0 (#7643)

---
 cloud-content/impl/pom.xml                        |  2 +-
 .../cloudcontent/BlobStoreFileSystemHandler.java  | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml
index 5211f31bf278..323ff7d968eb 100644
--- a/cloud-content/impl/pom.xml
+++ b/cloud-content/impl/pom.xml
@@ -14,7 +14,7 @@
   <packaging>sakai-component</packaging>
 
   <properties>
-    <jclouds.version>2.1.3</jclouds.version>
+    <jclouds.version>2.2.0</jclouds.version>
     <deploy.target>components</deploy.target>
   </properties>
 
diff --git a/cloud-content/impl/src/main/java/coza/opencollab/sakai/cloudcontent/BlobStoreFileSystemHandler.java b/cloud-content/impl/src/main/java/coza/opencollab/sakai/cloudcontent/BlobStoreFileSystemHandler.java
index c4e45b71e07d..5706eb3a65a0 100644
--- a/cloud-content/impl/src/main/java/coza/opencollab/sakai/cloudcontent/BlobStoreFileSystemHandler.java
+++ b/cloud-content/impl/src/main/java/coza/opencollab/sakai/cloudcontent/BlobStoreFileSystemHandler.java
@@ -9,27 +9,19 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.util.Date;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.Closeables;
-import com.google.inject.Module;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.jclouds.ContextBuilder;
-import org.jclouds.apis.ApiMetadata;
+import org.jclouds.aws.s3.AWSS3ProviderMetadata;
 import org.jclouds.blobstore.BlobStore;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.blobstore.domain.StorageMetadata;
-import org.jclouds.blobstore.options.PutOptions;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.io.Payload;
 import org.jclouds.io.Payloads;
 import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
-import org.jclouds.aws.s3.AWSS3ProviderMetadata;
 import org.jclouds.openstack.swift.v1.SwiftApiMetadata;
 import org.jclouds.osgi.ApiRegistry;
 import org.jclouds.osgi.ProviderRegistry;
@@ -37,6 +29,11 @@
 import org.sakaiproject.content.api.FileSystemHandler;
 import org.springframework.util.FileCopyUtils;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Closeables;
+import com.google.inject.Module;
+
 /**
  * The jclouds BlobStore implementation of FileSystemHandler.
  * <p/>