From 74ce09ee46a85f54f3a36a63651c7cf125d6229e Mon Sep 17 00:00:00 2001
From: matthew-a-dunlap <matthew_dunlap@harvard.edu>
Date: Thu, 27 Jul 2017 13:45:39 -0400
Subject: [PATCH 1/2] #3921 fixed aws import

AWS import now points to a version of the sdk that uses all its own unique named dependencies as to not cause conflicts.

As we go forward we should look into updating glassfish and using the normal SDK.
---
 pom.xml | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index e92eed2c648..69c5f4bb4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,16 +55,24 @@
     
     <dependencyManagement> 
         <dependencies> 
+            <!--Due to our old version of glassfish and its version of jackson,
+                we are pointing to an aws sdk with unique references to needed libraries.
+                If we update glassfish, we should return to the normal sdk as well. -->
             <dependency> 
                 <groupId>com.amazonaws</groupId> 
                 <artifactId>aws-java-sdk-bom</artifactId> 
-                <version>1.11.166</version> 
+                <version>1.11.169</version> 
                 <type>pom</type> 
                 <scope>import</scope> 
             </dependency> 
         </dependencies> 
     </dependencyManagement>
     <dependencies>
+<!--        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-bundle</artifactId>
+            <version>1.11.169</version>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -386,26 +394,11 @@
             <artifactId>joss</artifactId>
             <version>0.9.10</version>
         </dependency>
-        <!-- AWS S3 cloud storage -->
-<!--        <dependency> 
-            <groupId>com.amazonaws</groupId> 
-            <artifactId>aws-java-sdk-bom</artifactId> 
-            <version>1.11.166</version> 
-            <type>pom</type> 
-            <scope>import</scope> 
-        </dependency> -->
         <!--FIXME: Even with the aws block in DependencyManagement, maven complains about version? -->
-        <dependency> 
-            <groupId>com.amazonaws</groupId> 
-            <artifactId>aws-java-sdk-ec2</artifactId> 
-        </dependency> 
-        <dependency> 
-            <groupId>com.amazonaws</groupId> 
-            <artifactId>aws-java-sdk-s3</artifactId> 
-        </dependency> 
-        <dependency> 
-            <groupId>com.amazonaws</groupId> 
-            <artifactId>aws-java-sdk-dynamodb</artifactId> 
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-bundle</artifactId>
+            <version>1.11.169</version>
         </dependency>
         <dependency>
             <groupId>com.maxmind.geoip2</groupId>

From aa706b6deb7de25e2b83610fae117c89bb48b8b4 Mon Sep 17 00:00:00 2001
From: Rohit Bhattacharjee <rohit.bhattacharjee99@gmail.com>
Date: Mon, 31 Jul 2017 16:22:36 -0400
Subject: [PATCH 2/2]  we do not need to delete buckets before uploading #3921

---
 .../iq/dataverse/dataaccess/S3AccessIO.java   | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
index a2b02c2a5c2..d123b7540e1 100644
--- a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
+++ b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -11,6 +11,7 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.partitions.PartitionsLoader;
+import com.amazonaws.services.s3.model.GetObjectRequest;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
@@ -160,13 +161,27 @@ public void savePath(Path fileSystemPath) throws IOException {
             File inputFile = fileSystemPath.toFile();
 
             String bucketName = "testiqss-1239759fgsef34w4"; //name is global, no uppercase
-            s3.deleteBucket(bucketName);
-            String key = "MyObjectKey";
-                    
-            s3.createBucket(bucketName);
-            s3.putObject(new PutObjectRequest(bucketName, key, inputFile));
-
+           // s3.deleteBucket(bucketName);
+            String key = "MyObjectKey12";
+            
+            if(!s3.doesBucketExist(bucketName))
+            { 
+                System.out.println("Rohit Bhattacharjee!!!! True");
+                s3.createBucket(bucketName);
+            }
+            else
+            { 
+                System.out.println("Rohit Bhattacharjee!!!! False");
+                
+//                if(s3.doesObjectExist(bucketName, key)){
+//                    System.out.println("Rohit Bhattacharjee File Exists!!");
+//                }
+//                else{
+                    s3.putObject(new PutObjectRequest(bucketName, key, inputFile));
+//                }
+            
             newFileSize = inputFile.length();
+            }
 
         } catch (Exception ioex) {
             String failureMsg = ioex.getMessage();