diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 8a0363c..2773696 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -187,14 +187,27 @@
commons-logging
commons-logging
-
- org.slf4j
- slf4j-api
-
-
- org.slf4j
- slf4j-log4j12
-
+
+ commons-codec
+ commons-codec
+ compile
+
+
+ commons-lang
+ commons-lang
+ compile
+
+
+ commons-collections
+ commons-collections
+ 3.2.1
+ compile
+
+
+ commons-io
+ commons-io
+ compile
+
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java
index d91c8b2..a60d96c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java
@@ -27,10 +27,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.lang.reflect.Method;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
@@ -44,10 +44,8 @@ import org.apache.hadoop.classification.InterfaceStability;
@InterfaceAudience.Public
@InterfaceStability.Evolving
-public class JVM
-{
- static final Logger LOG = LoggerFactory.getLogger(JVM.class);
-
+public class JVM {
+ private static final Log LOG = LogFactory.getLog(JVM.class);
private OperatingSystemMXBean osMbean;
private static final boolean ibmvendor =
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 94e5323..b7009e1 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -70,6 +70,24 @@
test
+ org.apache.hbase
+ hbase-protocol
+ compile
+
+
+ org.apache.hbase
+ hbase-client
+ compile
+
+
+ org.apache.zookeeper
+ zookeeper
+
+
+ com.google.protobuf
+ protobuf-java
+
+
org.apache.hbase
hbase-server
@@ -84,12 +102,8 @@
libthrift
- org.slf4j
- slf4j-api
-
-
- org.slf4j
- slf4j-log4j12
+ commons-logging
+ commons-logging
diff --git a/hbase-hadoop1-compat/pom.xml b/hbase-hadoop1-compat/pom.xml
index 8df2960..86900b4 100644
--- a/hbase-hadoop1-compat/pom.xml
+++ b/hbase-hadoop1-compat/pom.xml
@@ -118,16 +118,16 @@ limitations under the License.
metrics-core
- log4j
- log4j
-
-
org.apache.hadoop
hadoop-test
${hadoop-one.version}
true
test
+
+ commons-logging
+ commons-logging
+
diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml
index c0c9ef0..00c3583 100644
--- a/hbase-hadoop2-compat/pom.xml
+++ b/hbase-hadoop2-compat/pom.xml
@@ -168,6 +168,18 @@ limitations under the License.
hadoop-minicluster
${hadoop-two.version}
+
+ commons-lang
+ commons-lang
+
+
+ commons-logging
+ commons-logging
+
+
+ com.google.guava
+ guava
+
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index a13b845..5fbf494 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -140,10 +140,43 @@
org.apache.hbase
hbase-common
+ jar
+
+
+ org.apache.hbase
+ hbase-common
test-jar
org.apache.hbase
+ hbase-protocol
+
+
+ org.apache.hbase
+ hbase-client
+
+
+ com.google.guava
+ guava
+
+
+ commons-logging
+ commons-logging
+
+
+ commons-cli
+ commons-cli
+
+
+ org.apache.commons
+ commons-math
+
+
+ commons-lang
+ commons-lang
+
+
+ org.apache.hbase
hbase-server
@@ -175,6 +208,10 @@
test-jar
test
+
+ org.cloudera.htrace
+ htrace
+
diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml
index 6254be4..8504b05 100644
--- a/hbase-prefix-tree/pom.xml
+++ b/hbase-prefix-tree/pom.xml
@@ -78,6 +78,104 @@
org.apache.hbase
hbase-common
+
+ org.apache.hbase
+ hbase-hadoop-compat
+
+
+ org.apache.hbase
+ ${compat.module}
+ ${project.version}
+
+
+ com.google.guava
+ guava
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ hadoop-1.1
+
+
+ !hadoop.profile
+
+
+
+
+ org.apache.hadoop
+ hadoop-core
+
+
+
+
+ hadoop-1.0
+
+
+ hadoop.profile
+ 1.0
+
+
+
+
+ org.apache.hadoop
+ hadoop-core
+
+
+
+
+
+ hadoop-2.0
+
+
+ hadoop.profile
+ 2.0
+
+
+
+
+ org.apache.hadoop
+ hadoop-client
+
+
+ org.apache.hadoop
+ hadoop-annotations
+
+
+
+
+
+ hadoop-3.0
+
+
+ hadoop.profile
+ 3.0
+
+
+
+ 3.0-SNAPSHOT
+
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-annotations
+
+
+
+
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index a4de5e4..f4428b5 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -300,6 +300,14 @@
test-jar
+ commons-httpclient
+ commons-httpclient
+
+
+ commons-collections
+ commons-collections
+
+
org.apache.hbase
hbase-hadoop-compat
@@ -330,6 +338,12 @@
com.yammer.metrics
metrics-core
+
+
+ org.slf4j
+ slf4j-api
+
+
com.google.guava
@@ -420,14 +434,6 @@
jackson-xc
- org.slf4j
- slf4j-api
-
-
- org.slf4j
- slf4j-log4j12
-
-
tomcat
jasper-compiler
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java
index f19ec5f..8c4ab61 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java
@@ -19,21 +19,19 @@
package org.apache.hadoop.hbase.thrift;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.thrift.server.TThreadedSelectorServer;
import org.apache.thrift.transport.TNonblockingServerTransport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A TThreadedSelectorServer.Args that reads hadoop configuration
*/
@InterfaceAudience.Private
public class HThreadedSelectorServerArgs extends TThreadedSelectorServer.Args {
-
- private static final Logger LOG =
- LoggerFactory.getLogger(TThreadedSelectorServer.class);
+ private static final Log LOG = LogFactory.getLog(TThreadedSelectorServer.class);
/**
* Number of selector threads for reading and writing socket
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
index 8741952..423c5c6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
@@ -65,8 +65,8 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
import org.junit.experimental.categories.Category;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Standup the master and fake it to test various aspects of master function.
@@ -78,7 +78,7 @@ import org.slf4j.LoggerFactory;
*/
@Category(MediumTests.class)
public class TestMasterNoCluster {
- private static Logger LOG = LoggerFactory.getLogger(TestMasterNoCluster.class);
+ private static final Log LOG = LogFactory.getLog(TestMasterNoCluster.class);
private static final HBaseTestingUtility TESTUTIL = new HBaseTestingUtility();
@BeforeClass
@@ -240,7 +240,7 @@ public class TestMasterNoCluster {
* @throws IOException
* @throws KeeperException
* @throws InterruptedException
- * @throws DeserializationException
+ * @throws DeserializationException
* @throws ServiceException
*/
@Test (timeout=30000)
diff --git a/pom.xml b/pom.xml
index 361fbf5..d77f54c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -596,6 +596,9 @@
prepare-package
+
test-jar
@@ -871,7 +874,9 @@
2.4
2.6
1.1.1
- 2.1
+ 2.2
+ 3.2.1
+ 3.0.1
2.1.2
12.0.1
1.8.8
@@ -883,7 +888,6 @@
1.6.8
4.11
1.50
- 1.4.3
1.2.17
1.9.0
2.4.1
@@ -1036,6 +1040,12 @@
com.yammer.metrics
metrics-core
${metrics-core.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
com.google.guava
@@ -1043,6 +1053,16 @@
${guava.version}
+ commons-collections
+ commons-collections
+ ${collections.version}
+
+
+ commons-httpclient
+ commons-httpclient
+ ${httpclient.version}
+
+
commons-cli
commons-cli
${commons-cli.version}
@@ -1191,16 +1211,6 @@
${jackson.version}
- org.slf4j
- slf4j-api
- ${slf4j.version}
-
-
- org.slf4j
- slf4j-log4j12
- ${slf4j.version}
-
-
${hadoop.version}
- 1.4.3
hbase-hadoop1-compat
src/main/assembly/hadoop-one-compat.xml
@@ -1554,7 +1568,6 @@
${hadoop-two.version}
- 1.6.1
hbase-hadoop2-compat
src/main/assembly/hadoop-two-compat.xml
@@ -1612,7 +1625,6 @@
- 1.6.1
3.0.0-SNAPSHOT