diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml index 1f61653145..16cdd7cedc 100644 --- a/hbase-hbck2/pom.xml +++ b/hbase-hbck2/pom.xml @@ -161,10 +161,9 @@ log4j-core ${log4j2.version} - org.apache.logging.log4j - log4j-1.2-api + log4j-slf4j-impl ${log4j2.version} diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/FsRegionsMetaRecoverer.java b/hbase-hbck2/src/main/java/org/apache/hbase/FsRegionsMetaRecoverer.java index 977ca7739e..455f7aba37 100644 --- a/hbase-hbck2/src/main/java/org/apache/hbase/FsRegionsMetaRecoverer.java +++ b/hbase-hbck2/src/main/java/org/apache/hbase/FsRegionsMetaRecoverer.java @@ -29,8 +29,8 @@ import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; import org.apache.hadoop.hbase.util.CommonFSUtils; import org.apache.hadoop.hbase.util.FSUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.Closeable; import java.io.IOException; @@ -51,7 +51,7 @@ * meta information found on HDFS region dirs as the valid ones. */ public class FsRegionsMetaRecoverer implements Closeable { - private static final Logger LOG = LogManager.getLogger(FsRegionsMetaRecoverer.class); + private static final Logger LOG = LoggerFactory.getLogger(FsRegionsMetaRecoverer.class); private final FileSystem fs; private final Connection conn; private final Configuration config; @@ -95,7 +95,7 @@ public Map> reportTablesMissingRegions(final List n result.put(tableName, findMissingRegionsInMETA(tableName.getNameWithNamespaceInclAsString())); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Can't get missing regions from meta", e); } }); return result; diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java b/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java index 0a83622822..23048cd4e3 100644 --- a/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java +++ b/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java @@ -58,10 +58,9 @@ import org.apache.hadoop.hbase.util.Pair; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configurator; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine; import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLineParser; @@ -73,6 +72,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos; + /** * HBase fixup tool version 2, for hbase-2.0.0+ clusters. * Supercedes hbck1. @@ -83,7 +83,7 @@ // then add a hbase-site.xml onto CLASSPATH for this tool to pick up. // + Add --version public class HBCK2 extends Configured implements org.apache.hadoop.util.Tool { - private static final Logger LOG = LogManager.getLogger(HBCK2.class); + private static final Logger LOG = LoggerFactory.getLogger(HBCK2.class); private static final int EXIT_SUCCESS = 0; static final int EXIT_FAILURE = 1; // Commands diff --git a/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java b/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java index 0c423c3ff3..35d1bb8f8f 100644 --- a/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java +++ b/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java @@ -42,14 +42,14 @@ import org.apache.hadoop.hbase.master.RegionState; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; -import org.apache.logging.log4j.LogManager; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.OutputStream; import java.io.PrintStream; @@ -63,7 +63,7 @@ * @see TestHBCKCommandLineParsing */ public class TestHBCK2 { - private static final org.apache.logging.log4j.Logger LOG = LogManager.getLogger(TestHBCK2.class); + private static final Logger LOG = LoggerFactory.getLogger(TestHBCK2.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final TableName TABLE_NAME = TableName.valueOf(TestHBCK2.class.getSimpleName()); private static final TableName REGION_STATES_TABLE_NAME = TableName. diff --git a/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCKMetaTableAccessor.java b/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCKMetaTableAccessor.java index c68c2809a0..015e440070 100644 --- a/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCKMetaTableAccessor.java +++ b/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCKMetaTableAccessor.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.logging.log4j.LogManager; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; @@ -43,7 +42,6 @@ */ public class TestHBCKMetaTableAccessor { - private static final org.apache.logging.log4j.Logger LOG = LogManager.getLogger(TestHBCK2.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @Rule diff --git a/pom.xml b/pom.xml index 28608800bb..d7448da752 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,8 @@ 3.0.0 2.2.0 3.9 + 3.0.0-M2 + 1.0-beta-9 @@ -414,6 +416,14 @@ org.apache.maven.plugins maven-enforcer-plugin + ${enforcer.version} + + + org.codehaus.mojo + extra-enforcer-rules + ${extra.enforcer.version} + + @@ -424,7 +434,10 @@ either "mvn -version" or "mvn enforcer:display-info" to verify what version is active. Non-release builds can temporarily build with a newer JDK version by setting the 'compileSource' property (eg. mvn -DcompileSource=1.8 clean package). - + + + module-info +