diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 3ae4565..87b5ec6 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -373,6 +373,10 @@ org.apache.hadoop hadoop-common + + org.apache.hadoop + hadoop-mapreduce-client-core + diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java index 0385355..8088c4c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java @@ -69,7 +69,7 @@ public class TestConfServlet extends TestCase { String resource = (String)propertyInfo.get("resource"); System.err.println("k: " + key + " v: " + val + " r: " + resource); if (TEST_KEY.equals(key) && TEST_VAL.equals(val) - && "programatically".equals(resource)) { + && ("programatically".equals(resource) || "programmatically".equals(resource))) { foundSetting = true; } } diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml new file mode 100644 index 0000000..f8ebcda --- /dev/null +++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml @@ -0,0 +1,46 @@ + + + + + + bin + + tar.gz + + + src/main/assembly/components.xml + + + + + true + + + lib + false + + + + + + +