HDFS-9167. Update pom.xml in other modules to depend on hdfs-client instead of hdfs. Contributed by Mingliang Liu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da8441d0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da8441d0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da8441d0 Branch: refs/heads/HDFS-7966 Commit: da8441d0fe9149bb845dcf701fdc86e786b6afba Parents: aa299ec Author: Haohui Mai <whe...@apache.org> Authored: Tue Oct 13 15:24:24 2015 -0700 Committer: Haohui Mai <whe...@apache.org> Committed: Tue Oct 13 15:24:24 2015 -0700 ---------------------------------------------------------------------- hadoop-client/pom.xml | 6 +----- hadoop-dist/pom.xml | 2 +- hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml | 5 ----- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop-hdfs/src/contrib/bkjournal/pom.xml | 5 ----- .../hadoop-mapreduce-client-hs/pom.xml | 2 +- .../hadoop-mapreduce-examples/pom.xml | 2 +- hadoop-tools/hadoop-ant/pom.xml | 2 +- .../src/main/java/org/apache/hadoop/ant/DfsTask.java | 9 +++++++-- hadoop-tools/hadoop-archives/pom.xml | 12 +++++++++++- hadoop-tools/hadoop-datajoin/pom.xml | 12 +++++++++++- hadoop-tools/hadoop-distcp/pom.xml | 7 ++++++- .../main/java/org/apache/hadoop/tools/DistCpSync.java | 8 ++++---- hadoop-tools/hadoop-extras/pom.xml | 12 +++++++++++- hadoop-tools/hadoop-gridmix/pom.xml | 7 ++++++- hadoop-tools/hadoop-rumen/pom.xml | 2 +- hadoop-tools/hadoop-streaming/pom.xml | 12 +++++++++++- 17 files changed, 76 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml index 2324dba..1064659 100644 --- a/hadoop-client/pom.xml +++ b/hadoop-client/pom.xml @@ -104,14 +104,10 @@ <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>compile</scope> <exclusions> <exclusion> - <groupId>commons-daemon</groupId> - <artifactId>commons-daemon</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml index f1644a8..9d37599 100644 --- a/hadoop-dist/pom.xml +++ b/hadoop-dist/pom.xml @@ -39,7 +39,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml index ac8930c..9a9d29c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml @@ -58,11 +58,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index e3b4bcf..cdc8dfd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1550,6 +1550,9 @@ Release 2.8.0 - UNRELEASED HDFS-9145. Tracking methods that hold FSNamesytemLock for too long. (Mingliang Liu via wheat9) + HDFS-9167. Update pom.xml in other modules to depend on hdfs-client instead + of hdfs. (Mingliang Liu via wheat9) + BUG FIXES HDFS-7501. TransactionsSinceLastCheckpoint can be negative on SBNs. http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml index 005ee4d..047f0e1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml @@ -52,11 +52,6 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";> <artifactId>hadoop-hdfs</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml index 3372019..b5509bd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml index a94e663..041a5a8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/pom.xml @@ -67,7 +67,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>runtime</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-ant/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-ant/pom.xml b/hadoop-tools/hadoop-ant/pom.xml index 197b527..a09fdd1 100644 --- a/hadoop-tools/hadoop-ant/pom.xml +++ b/hadoop-tools/hadoop-ant/pom.xml @@ -48,7 +48,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java index 9d0b3a4..8dc7f37 100644 --- a/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java +++ b/hadoop-tools/hadoop-ant/src/main/java/org/apache/hadoop/ant/DfsTask.java @@ -32,7 +32,6 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.apache.hadoop.util.ToolRunner; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.hdfs.HdfsConfiguration; /** * {@link org.apache.hadoop.fs.FsShell FsShell} wrapper for ant Task. @@ -40,6 +39,12 @@ import org.apache.hadoop.hdfs.HdfsConfiguration; @InterfaceAudience.Private public class DfsTask extends Task { + static { + // adds the default resources + Configuration.addDefaultResource("hdfs-default.xml"); + Configuration.addDefaultResource("hdfs-site.xml"); + } + /** * Default sink for {@link java.lang.System#out} * and {@link java.lang.System#err}. @@ -187,7 +192,7 @@ public class DfsTask extends Task { try { pushContext(); - Configuration conf = new HdfsConfiguration(); + Configuration conf = new Configuration(); conf.setClassLoader(confloader); exit_code = ToolRunner.run(conf, shell, argv.toArray(new String[argv.size()])); http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-archives/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-archives/pom.xml b/hadoop-tools/hadoop-archives/pom.xml index 5334f48..30baa1c 100644 --- a/hadoop-tools/hadoop-archives/pom.xml +++ b/hadoop-tools/hadoop-archives/pom.xml @@ -41,6 +41,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> <scope>provided</scope> @@ -73,7 +78,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -86,6 +91,11 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-datajoin/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-datajoin/pom.xml b/hadoop-tools/hadoop-datajoin/pom.xml index a4d00f8..ff511f1 100644 --- a/hadoop-tools/hadoop-datajoin/pom.xml +++ b/hadoop-tools/hadoop-datajoin/pom.xml @@ -38,6 +38,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> <scope>provided</scope> @@ -70,7 +75,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -83,6 +88,11 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-distcp/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/pom.xml b/hadoop-tools/hadoop-distcp/pom.xml index 374155d..7099cec 100644 --- a/hadoop-tools/hadoop-distcp/pom.xml +++ b/hadoop-tools/hadoop-distcp/pom.xml @@ -79,13 +79,18 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpSync.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpSync.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpSync.java index 47a28a6..2b8ed71 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpSync.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpSync.java @@ -20,7 +20,7 @@ package org.apache.hadoop.tools; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.DFSUtil; +import org.apache.hadoop.hdfs.DFSUtilClient; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.protocol.HdfsConstants; import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport; @@ -165,13 +165,13 @@ class DistCpSync { entry.getType() == SnapshotDiffReport.DiffType.CREATE || entry.getType() == SnapshotDiffReport.DiffType.DELETE) { final Path source = - new Path(DFSUtil.bytes2String(entry.getSourcePath())); + new Path(DFSUtilClient.bytes2String(entry.getSourcePath())); list.add(new DiffInfo(source, null, entry.getType())); } else if (entry.getType() == SnapshotDiffReport.DiffType.RENAME) { final Path source = - new Path(DFSUtil.bytes2String(entry.getSourcePath())); + new Path(DFSUtilClient.bytes2String(entry.getSourcePath())); final Path target = - new Path(DFSUtil.bytes2String(entry.getTargetPath())); + new Path(DFSUtilClient.bytes2String(entry.getTargetPath())); list.add(new DiffInfo(source, target, entry.getType())); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-extras/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-extras/pom.xml b/hadoop-tools/hadoop-extras/pom.xml index 429f4a3..5f75875 100644 --- a/hadoop-tools/hadoop-extras/pom.xml +++ b/hadoop-tools/hadoop-extras/pom.xml @@ -41,6 +41,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> <scope>provided</scope> @@ -73,7 +78,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -86,6 +91,11 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-gridmix/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-gridmix/pom.xml b/hadoop-tools/hadoop-gridmix/pom.xml index a3cac91..baa72ca 100644 --- a/hadoop-tools/hadoop-gridmix/pom.xml +++ b/hadoop-tools/hadoop-gridmix/pom.xml @@ -75,7 +75,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -88,6 +88,11 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-rumen/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-rumen/pom.xml b/hadoop-tools/hadoop-rumen/pom.xml index 0475128..6828b1c 100644 --- a/hadoop-tools/hadoop-rumen/pom.xml +++ b/hadoop-tools/hadoop-rumen/pom.xml @@ -73,7 +73,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hadoop/blob/da8441d0/hadoop-tools/hadoop-streaming/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-streaming/pom.xml b/hadoop-tools/hadoop-streaming/pom.xml index 9acc43b..5ea10f6 100644 --- a/hadoop-tools/hadoop-streaming/pom.xml +++ b/hadoop-tools/hadoop-streaming/pom.xml @@ -42,6 +42,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> <scope>provided</scope> @@ -79,7 +84,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> + <artifactId>hadoop-hdfs-client</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -92,6 +97,11 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> <type>test-jar</type> </dependency> <dependency>
