HADOOP-14040. Use shaded aws-sdk uber-JAR 1.11.86. Contributed by Steve Loughran and Sean Mackrory
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/658702ef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/658702ef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/658702ef Branch: refs/heads/HADOOP-13345 Commit: 658702efffdf52cf5ddf8e92f959f1157c95a348 Parents: bdad8b7 Author: Mingliang Liu <lium...@apache.org> Authored: Thu Feb 16 16:51:03 2017 -0800 Committer: Mingliang Liu <lium...@apache.org> Committed: Thu Feb 16 16:51:03 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/658702ef/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 606f7fc..47e21d8 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -126,7 +126,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> <!-- the version of Hadoop declared in the version resources; can be overridden so that Hadoop 3.x can declare itself a 2.x artifact. --> <declared.hadoop.version>${project.version}</declared.hadoop.version> @@ -791,12 +791,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/658702ef/hadoop-tools/hadoop-aws/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index 1f64b02..0fdbc5d 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -331,7 +331,7 @@ </dependency> <dependency> <groupId>com.amazonaws</groupId> - <artifactId>aws-java-sdk-s3</artifactId> + <artifactId>aws-java-sdk-bundle</artifactId> <scope>compile</scope> </dependency> <dependency> @@ -355,11 +355,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: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
