From ec26c431f977cae8fd289e7b83c5f5c5e1946634 Mon Sep 17 00:00:00 2001
From: Steve Loughran <stevel@cloudera.com>
Date: Thu, 6 Jun 2019 10:06:10 +0100
Subject: [PATCH] HADOOP-16117. Update AWS SDK to 1.11.563.

Contributed by Steve Loughran.

Change-Id: I7c46ed2a6378e1370f567acf4cdcfeb93e43fa13
---
 NOTICE.txt                                        | 15 +++++----------
 hadoop-project/pom.xml                            |  2 +-
 .../src/site/markdown/tools/hadoop-aws/testing.md |  4 ++++
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index b4329b8095a..2cda1556051 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -8,17 +8,12 @@ following notices:
 * Copyright 2011 FuseSource Corp. http://fusesource.com
 
 The binary distribution of this product bundles binaries of
-AWS SDK for Java - Bundle 1.11.375,
-AWS Java SDK for AWS KMS 1.11.375,
-AWS Java SDK for Amazon S3 1.11.375,
-AWS Java SDK for AWS STS 1.11.375,
-JMES Path Query library 1.0,
+AWS SDK for Java - Bundle 1.11.563 (https://github.com/aws/aws-sdk-java),
 which has the following notices:
- * This software includes third party software subject to the following
- copyrights: - XML parsing and utility functions from JetS3t - Copyright
- 2006-2009 James Murty. - JSON parsing and utility functions from JSON.org -
- Copyright 2002 JSON.org. - PKCS#1 PEM encoded private key parsing and utility
- functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
+
+This software includes third party software subject to the following copyrights:
+- XML parsing and utility functions from JetS3t - Copyright 2006-2009 James Murty.
+- PKCS#1 PEM encoded private key parsing and utility functions from oauth.googlecode.com - Copyright 1998-2010 AOL Inc.
 
 The binary distribution of this product bundles binaries of
 Gson 2.2.4,
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index f4ec48ac0bf..dc8cc8d6baf 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -146,7 +146,7 @@
     <exec-maven-plugin.version>1.3.1</exec-maven-plugin.version>
     <make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version>
     <surefire.fork.timeout>900</surefire.fork.timeout>
-    <aws-java-sdk.version>1.11.375</aws-java-sdk.version>
+    <aws-java-sdk.version>1.11.563</aws-java-sdk.version>
     <hsqldb.version>2.3.4</hsqldb.version>
     <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
     <jasmine-maven-plugin.version>2.1</jasmine-maven-plugin.version>
diff --git a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/testing.md b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/testing.md
index f61b46a8da6..7a591d99b60 100644
--- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/testing.md
+++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/testing.md
@@ -1334,6 +1334,7 @@ bin/hadoop fs -mv $BUCKET/file $BUCKET/file2
 # expect "No such file or directory"
 bin/hadoop fs -stat $BUCKET/file
 bin/hadoop fs -stat $BUCKET/file2
+bin/hadoop fs -mkdir $BUCKET/dir-no-trailing
 bin/hadoop fs -mv $BUCKET/file2 $BUCKET/dir-no-trailing
 bin/hadoop fs -stat $BUCKET/dir-no-trailing/file2
 # treated the same as the file stat
@@ -1348,6 +1349,9 @@ bin/hadoop fs -test -d  $BUCKET/dir-no-trailing/file2 ; echo $?
 bin/hadoop fs -checksum $BUCKET/dir-no-trailing/file2
 # expect "etag" + a long string
 bin/hadoop fs -D fs.s3a.etag.checksum.enabled=true -checksum $BUCKET/dir-no-trailing/file2
+bin/hadoop fs -expunge -immediate -fs $BUCKET
+bin/hdfs fetchdt --webservice $BUCKET secrets.bin
+bin/hdfs fetchdt -D fs.s3a.delegation.token.binding=org.apache.hadoop.fs.s3a.auth.delegation.SessionTokenBinding --webservice $BUCKET secrets.bin
 ```
 
 ### Other tests