Repository: hadoop Updated Branches: refs/heads/branch-2 29e100717 -> b23e93d46
HADOOP-14040. Use shaded aws-sdk uber-JAR 1.11.86. Contributed by Steve Loughran and Sean Mackrory (cherry picked from commit 658702efffdf52cf5ddf8e92f959f1157c95a348) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b23e93d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b23e93d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b23e93d4 Branch: refs/heads/branch-2 Commit: b23e93d465a16a1604266b010776807d50259a0d Parents: 29e1007 Author: Mingliang Liu <[email protected]> Authored: Thu Feb 16 16:51:03 2017 -0800 Committer: Mingliang Liu <[email protected]> Committed: Thu Feb 16 16:59:31 2017 -0800 ---------------------------------------------------------------------- hadoop-project/pom.xml | 9 ++------- hadoop-tools/hadoop-aws/pom.xml | 7 +------ 2 files changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b23e93d4/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index bd96691..e156a73 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -117,7 +117,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.45</aws-java-sdk.version> + <aws-java-sdk.version>1.11.86</aws-java-sdk.version> </properties> <dependencyManagement> @@ -684,12 +684,7 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-s3</artifactId> - <version>${aws-java-sdk.version}</version> - </dependency> - <dependency> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-sts</artifactId> + <artifactId>aws-java-sdk-bundle</artifactId> <version>${aws-java-sdk.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/b23e93d4/hadoop-tools/hadoop-aws/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index bf41864..7e90ac9 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -314,7 +314,7 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-s3</artifactId> + <artifactId>aws-java-sdk-bundle</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -338,11 +338,6 @@ <artifactId>joda-time</artifactId> </dependency> <dependency> - <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-sts</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
