#54 aws version up

jcabi · Sep 5, 2017 · 32fd4b5 · 32fd4b5
1 parent 59356ce
commit 32fd4b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -80,12 +80,12 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-core</artifactId>
-      <version>1.10.66</version>
+      <version>1.11.188</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-s3</artifactId>
-      <version>1.10.66</version>
+      <version>1.11.188</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/src/main/java/com/jcabi/s3/AwsOcket.java b/src/main/java/com/jcabi/s3/AwsOcket.java
@@ -39,6 +39,7 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.transfer.TransferManager;
+import com.amazonaws.services.s3.transfer.TransferManagerBuilder;
 import com.amazonaws.services.s3.transfer.Upload;
 import com.amazonaws.services.s3.transfer.model.UploadResult;
 import com.jcabi.aspects.Immutable;
@@ -210,7 +211,8 @@ public void write(final InputStream input, final ObjectMetadata meta)
         try {
             final AmazonS3 aws = this.bkt.region().aws();
             final long start = System.currentTimeMillis();
-            final TransferManager tmgr = new TransferManager(aws);
+            final TransferManager tmgr = TransferManagerBuilder.standard()
+                .withS3Client(aws).build();
             final Upload upload = tmgr.upload(
                 this.bkt.name(), this.name, cnt, meta
             );

diff --git a/src/main/java/com/jcabi/s3/Region.java b/src/main/java/com/jcabi/s3/Region.java
@@ -29,9 +29,10 @@
  */
 package com.jcabi.s3;
 
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
 import lombok.EqualsAndHashCode;
@@ -98,9 +99,11 @@ public Bucket bucket(final String name) {
         }
         @Override
         public AmazonS3 aws() {
-            return new AmazonS3Client(
-                new BasicAWSCredentials(this.key, this.secret)
-            );
+            return AmazonS3ClientBuilder.standard().withCredentials(
+                new AWSStaticCredentialsProvider(
+                    new BasicAWSCredentials(this.key, this.secret)
+                )
+            ).build();
         }
     }
 }