Index: hbase-common/pom.xml =================================================================== --- hbase-common/pom.xml (revision 1508682) +++ hbase-common/pom.xml (working copy) @@ -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 + Index: hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java (revision 1508682) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/util/JVM.java (working copy) @@ -27,10 +27,10 @@ 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 @@ @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 = Index: hbase-examples/pom.xml =================================================================== --- hbase-examples/pom.xml (revision 1508682) +++ hbase-examples/pom.xml (working copy) @@ -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,13 +102,9 @@ libthrift - org.slf4j - slf4j-api + commons-logging + commons-logging - - org.slf4j - slf4j-log4j12 - Index: hbase-hadoop1-compat/pom.xml =================================================================== --- hbase-hadoop1-compat/pom.xml (revision 1508682) +++ hbase-hadoop1-compat/pom.xml (working copy) @@ -118,16 +118,16 @@ metrics-core - log4j - log4j - - org.apache.hadoop hadoop-test ${hadoop-one.version} true test + + commons-logging + commons-logging + Index: hbase-hadoop2-compat/pom.xml =================================================================== --- hbase-hadoop2-compat/pom.xml (revision 1508682) +++ hbase-hadoop2-compat/pom.xml (working copy) @@ -168,6 +168,18 @@ hadoop-minicluster ${hadoop-two.version} + + commons-lang + commons-lang + + + commons-logging + commons-logging + + + com.google.guava + guava + Index: hbase-it/pom.xml =================================================================== --- hbase-it/pom.xml (revision 1508682) +++ hbase-it/pom.xml (working copy) @@ -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 + Index: hbase-prefix-tree/pom.xml =================================================================== --- hbase-prefix-tree/pom.xml (revision 1508682) +++ hbase-prefix-tree/pom.xml (working copy) @@ -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 + + + + Index: hbase-server/pom.xml =================================================================== --- hbase-server/pom.xml (revision 1508682) +++ hbase-server/pom.xml (working copy) @@ -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 Index: hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java (revision 1508682) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/HThreadedSelectorServerArgs.java (working copy) @@ -19,22 +19,20 @@ 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 Log LOG = LogFactory.getLog(TThreadedSelectorServer.class); - private static final Logger LOG = - LoggerFactory.getLogger(TThreadedSelectorServer.class); - /** * Number of selector threads for reading and writing socket */ Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (revision 1508682) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java (working copy) @@ -65,8 +65,8 @@ 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 @@ */ @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 @@ * @throws IOException * @throws KeeperException * @throws InterruptedException - * @throws DeserializationException + * @throws DeserializationException * @throws ServiceException */ @Test (timeout=30000) Index: pom.xml =================================================================== --- pom.xml (revision 1508682) +++ pom.xml (working copy) @@ -884,7 +884,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 @@ -896,7 +898,6 @@ 1.6.8 4.11 1.50 - 1.4.3 1.2.17 1.9.0 2.4.1 @@ -1049,6 +1050,12 @@ com.yammer.metrics metrics-core ${metrics-core.version} + + + org.slf4j + slf4j-api + + com.google.guava @@ -1056,6 +1063,16 @@ ${guava.version} + commons-collections + commons-collections + ${collections.version} + + + commons-httpclient + commons-httpclient + ${httpclient.version} + + commons-cli commons-cli ${commons-cli.version} @@ -1204,16 +1221,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 @@ -1567,7 +1578,6 @@ ${hadoop-two.version} - 1.6.1 hbase-hadoop2-compat src/main/assembly/hadoop-two-compat.xml @@ -1625,7 +1635,6 @@ - 1.6.1 3.0.0-SNAPSHOT