Browse Source

HADOOP-16055. Upgrade AWS SDK to 1.11.271 in branch-2.

(cherry picked from commit 7bca49c0d20f135683ce9f3a7e5c0634feea20fe)
Akira Ajisaka 6 năm trước cách đây
mục cha
commit
f058763774
2 tập tin đã thay đổi với 11 bổ sung7 xóa
  1. 4 6
      NOTICE.txt
  2. 7 1
      hadoop-project/pom.xml

+ 4 - 6
NOTICE.txt

@@ -17,13 +17,11 @@ which has the following notices:
 * This product includes software developed by IBM Corporation and others.
 
 The binary distribution of this product bundles binaries of
-AWS Java SDK 1.11.199,
+AWS Java SDK 1.11.271,
 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,

+ 7 - 1
hadoop-project/pom.xml

@@ -131,7 +131,7 @@
     <make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version>
     <native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version>
     <surefire.fork.timeout>900</surefire.fork.timeout>
-    <aws-java-sdk.version>1.11.199</aws-java-sdk.version>
+    <aws-java-sdk.version>1.11.271</aws-java-sdk.version>
     <hsqldb.version>2.3.4</hsqldb.version>
     <frontend-maven-plugin.version>1.5</frontend-maven-plugin.version>
     <!-- the version of Hadoop declared in the version resources; can be overridden
@@ -773,6 +773,12 @@
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-bundle</artifactId>
         <version>${aws-java-sdk.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.mina</groupId>