diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 91503d5..054a0f7 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -662,7 +662,7 @@
- 3.0-SNAPSHOT
+ ${hadoop-three.version}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/InfoServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/InfoServer.java
index 911f040..6720cdd 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/InfoServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/InfoServer.java
@@ -37,8 +37,9 @@ import org.apache.hadoop.conf.Configuration;
*/
@InterfaceAudience.Private
public class InfoServer {
+
private static final String HBASE_APP_DIR = "hbase-webapps";
- private final HttpServer httpServer;
+ private final org.apache.hadoop.hbase.http.HttpServer httpServer;
/**
* Create a status server on the given port.
@@ -53,7 +54,8 @@ public class InfoServer {
public InfoServer(String name, String bindAddress, int port, boolean findPort,
final Configuration c)
throws IOException {
- HttpServer.Builder builder = new HttpServer.Builder();
+ HttpServer.Builder builder =
+ new org.apache.hadoop.hbase.http.HttpServer.Builder();
builder
.setName(name)
.addEndpoint(URI.create("http://" + bindAddress + ":" + port))
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java
index 7502d8c..9ad27ba 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java
@@ -163,8 +163,8 @@ public class ProtobufLogWriter extends WriterBase {
@Override
public void sync() throws IOException {
try {
- this.output.flush();
- this.output.sync();
+ this.output.hflush();
+ this.output.hsync();
} catch (NullPointerException npe) {
// Concurrent close...
throw new IOException(npe);
diff --git a/pom.xml b/pom.xml
index f36286c..846358c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -899,6 +899,7 @@
1.7
2.4.0
+ 3.0.0-SNAPSHOT
1.2
1.7
@@ -1674,29 +1675,158 @@
3.0
+
+
+ hbase-hadoop2-compat
+
- 3.0.0-SNAPSHOT
+ ${hadoop-three.version}
+
+ hbase-hadoop2-compat
+ src/main/assembly/hadoop-three-compat.xml
-
-
- org.apache.hadoop
- hadoop-common
- ${hadoop.version}
-
-
- org.apache.hadoop
- hadoop-annotations
- ${hadoop.version}
-
-
-
-
- org.apache.hadoop
- hadoop-minicluster
- ${hadoop.version}
- compile
-
-
+
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+ ${hadoop-three.version}
+
+
+ io.netty
+ netty
+
+
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-jobclient
+ ${hadoop-three.version}
+
+
+ io.netty
+ netty
+
+
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-jobclient
+ ${hadoop-three.version}
+ test-jar
+ test
+
+
+ io.netty
+ netty
+
+
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ javax.servlet
+ servlet-api
+
+
+ stax
+ stax-api
+
+
+ ${hadoop-three.version}
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ ${hadoop-three.version}
+ test-jar
+ test
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ javax.servlet
+ servlet-api
+
+
+ stax
+ stax-api
+
+
+
+
+ org.apache.hadoop
+ hadoop-auth
+ ${hadoop-three.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+ ${hadoop-three.version}
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ javax.servlet
+ servlet-api
+
+
+ stax
+ stax-api
+
+
+ io.netty
+ netty
+
+
+
+
+ org.apache.hadoop
+ hadoop-client
+ ${hadoop-three.version}
+
+
+ org.apache.hadoop
+ hadoop-annotations
+ ${hadoop-three.version}
+
+
+
+ org.apache.hadoop
+ hadoop-minicluster
+ ${hadoop-three.version}
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ javax.servlet
+ servlet-api
+
+
+ stax
+ stax-api
+
+
+ io.netty
+ netty
+
+
+
+
+