hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject [hadoop] branch branch-2.9 updated: HADOOP-16055. Upgrade AWS SDK to 1.11.271 in branch-2.
Date Fri, 15 Feb 2019 06:15:18 GMT
This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2.9 by this push:
     new f058763  HADOOP-16055. Upgrade AWS SDK to 1.11.271 in branch-2.
f058763 is described below

commit f05876377478de9fb7a4e399b138781afbd9eb0f
Author: Akira Ajisaka <aajisaka@apache.org>
AuthorDate: Fri Jan 25 21:09:06 2019 +0900

    HADOOP-16055. Upgrade AWS SDK to 1.11.271 in branch-2.
    
    (cherry picked from commit 7bca49c0d20f135683ce9f3a7e5c0634feea20fe)
---
 NOTICE.txt             | 10 ++++------
 hadoop-project/pom.xml |  8 +++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 6ab0214..3b0784a 100644
--- a/NOTICE.txt
+++ b/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,
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 4820dee..1e39f13 100644
--- a/hadoop-project/pom.xml
+++ b/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>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message