Updated Branches: refs/heads/master 2709efa14 -> 9ae8d3948
ACCUMULO-1537 fix build for hadoop-2 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9ae8d394 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ae8d394 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ae8d394 Branch: refs/heads/master Commit: 9ae8d39488a5559ca29c5b6085cfe5f2ae50d164 Parents: 2709efa Author: Eric Newton <e...@apache.org> Authored: Tue Jul 23 16:41:52 2013 -0400 Committer: Eric Newton <e...@apache.org> Committed: Tue Jul 23 16:41:52 2013 -0400 ---------------------------------------------------------------------- minicluster/pom.xml | 2 +- .../org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 3 +-- pom.xml | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae8d394/minicluster/pom.xml ---------------------------------------------------------------------- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index d7c8778..c35e7a5 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -47,7 +47,7 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> + <artifactId>hadoop-minicluster</artifactId> </dependency> <dependency> <groupId>commons-configuration</groupId> http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae8d394/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java index 4f9ff89..24dcb39 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java @@ -58,7 +58,6 @@ import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.hadoop.hdfs.server.datanode.DataNode; import org.apache.zookeeper.server.ZooKeeperServerMain; /** @@ -228,7 +227,7 @@ public class MiniAccumuloCluster { conf.set(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY, dn.getAbsolutePath()); conf.set(DFSConfigKeys.DFS_REPLICATION_KEY, "1"); conf.set(DFSConfigKeys.DFS_SUPPORT_APPEND_KEY, "true"); - conf.set(DataNode.DATA_DIR_PERMISSION_KEY, "775"); + conf.set("dfs.datanode.data.dir.perm", "775"); miniDFS = new MiniDFSCluster(conf, 1, true, null); miniDFS.waitClusterUp(); InetSocketAddress dfsAddress = miniDFS.getNameNode().getNameNodeAddress(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ae8d394/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c8fa357..ec1c48c 100644 --- a/pom.xml +++ b/pom.xml @@ -300,11 +300,6 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-tools</artifactId> <version>${hadoop.version}</version> </dependency>