You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cn...@apache.org on 2014/12/18 00:00:04 UTC
[18/24] hadoop git commit: HADOOP-10400. Incorporate new S3A
FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang.
HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang.
(cherry picked from commit 24d920b80eb3626073925a1d0b6dcf148add8cc0)
Conflicts:
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/BasicAWSCredentialsProvider.java
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AInputStream.java
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AOutputStream.java
hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/contract/s3a/TestS3AContractRename.java
hadoop-tools/hadoop-aws/src/test/resources/contract/s3a.xml
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/66808e6a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/66808e6a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/66808e6a
Branch: refs/heads/branch-2
Commit: 66808e6aace205a85b614e3d75803ec2cd05260a
Parents: 535d98b
Author: Aaron T. Myers <at...@apache.org>
Authored: Mon Sep 15 08:27:07 2014 -0700
Committer: cnauroth <cn...@apache.org>
Committed: Wed Dec 17 14:57:13 2014 -0800
----------------------------------------------------------------------
hadoop-tools/hadoop-azure/pom.xml | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/66808e6a/hadoop-tools/hadoop-azure/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-azure/pom.xml b/hadoop-tools/hadoop-azure/pom.xml
index 97c10fc..b428fb2 100644
--- a/hadoop-tools/hadoop-azure/pom.xml
+++ b/hadoop-tools/hadoop-azure/pom.xml
@@ -132,14 +132,8 @@
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
<scope>compile</scope>
</dependency>