From 09993f30bf49e53a7d799505305133fd2c79b146 Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Mon, 9 Mar 2015 19:16:26 +0100
Subject: [PATCH] Update aws-sdk-java to 1.9.23

Release notes:

* [1.9.23](https://aws.amazon.com/releasenotes/Java/0061646886197506)
* [1.9.22](https://aws.amazon.com/releasenotes/Java/9983269688843537)
* [1.9.21](https://aws.amazon.com/releasenotes/Java/0068314282259743)
* [1.9.20.1](https://aws.amazon.com/releasenotes/Java/1468424988909152)
* [1.9.20](https://aws.amazon.com/releasenotes/Java/4095479451567110)
* [1.9.19](https://aws.amazon.com/releasenotes/Java/7152067748916749)
* [1.9.18](https://aws.amazon.com/releasenotes/Java/8255923333358616)
* [1.9.17](https://aws.amazon.com/releasenotes/Java/7976814583460560)
* [1.9.16](https://aws.amazon.com/releasenotes/Java/7930704610010512)
* [1.9.15](https://aws.amazon.com/releasenotes/Java/7196148869312092)
* [1.9.14](https://aws.amazon.com/releasenotes/Java/5550164873229724)
* [1.9.13](https://aws.amazon.com/releasenotes/Java/4588838060473154)
* [1.9.12](https://aws.amazon.com/releasenotes/Java/4184046784243318)
* [1.9.11](https://aws.amazon.com/releasenotes/Java/4181470878749498)
* [1.9.10](https://aws.amazon.com/releasenotes/Java/7263787800932935)
* [1.9.9](https://aws.amazon.com/releasenotes/Java/1369906126177804)

(cherry picked from commit 16a2f39)
(cherry picked from commit 5e13c68)
(cherry picked from commit 471f755)
---
 pom.xml                                                      | 2 +-
 .../java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1035a010074..50e11f782d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     </parent>
 
     <properties>
-        <amazonaws.version>1.9.8</amazonaws.version>
+        <amazonaws.version>1.9.23</amazonaws.version>
     </properties>
 
     <dependencies>
diff --git a/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java b/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java
index 950aa72af8e..33b14fefd66 100644
--- a/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java
+++ b/src/test/java/org/elasticsearch/cloud/aws/AmazonS3Wrapper.java
@@ -192,6 +192,11 @@ public class AmazonS3Wrapper implements AmazonS3 {
         delegate.setObjectAcl(bucketName, key, versionId, acl);
     }
 
+    @Override
+    public void setObjectAcl(SetObjectAclRequest setObjectAclRequest) throws AmazonClientException, AmazonServiceException {
+        delegate.setObjectAcl(setObjectAclRequest);
+    }
+
     @Override
     public AccessControlList getBucketAcl(String bucketName) throws AmazonClientException, AmazonServiceException {
         return delegate.getBucketAcl(bucketName);