From 9ce72fe67b62f2b418a514727069e58dc5279823 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Fri, 15 May 2020 22:53:20 +0200 Subject: [PATCH] fix broken build Combination of recently separately merged PRs #865 and #859 broke it. --- .../contentrepository/S3ContentRepository.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java index 08020712e..6732a5205 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java @@ -20,9 +20,10 @@ package org.apache.fineract.infrastructure.documentmanagement.contentrepository; import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; +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.amazonaws.services.s3.model.AmazonS3Exception; import com.amazonaws.services.s3.model.DeleteObjectRequest; import com.amazonaws.services.s3.model.GetObjectRequest; @@ -53,7 +54,8 @@ public class S3ContentRepository implements ContentRepository { public S3ContentRepository(final String bucketName, final String secretKey, final String accessKey) { this.s3BucketName = bucketName; - this.s3Client = new AmazonS3Client(new BasicAWSCredentials(accessKey, secretKey)); + this.s3Client = AmazonS3ClientBuilder.standard() + .withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey))).build(); } @Override