diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml index bb0de8dc3f..5f902fc83c 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/pom.xml @@ -11,6 +11,7 @@ com.google.cloud.bigtable.hbase.tools.HBaseSchemaTranslator + 2.15.0 bigtable-hbase-1.x-tools @@ -54,14 +55,15 @@ 30.1.1-android - org.slf4j - slf4j-api - ${slf4j.version} + org.apache.logging.log4j + log4j-api + ${log4j2.version} - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-core + ${log4j2.version} + runtime com.google.code.findbugs diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/java/com/google/cloud/bigtable/hbase/tools/HBaseSchemaTranslator.java b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/java/com/google/cloud/bigtable/hbase/tools/HBaseSchemaTranslator.java index 4dab136ce0..60eecf6729 100644 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/java/com/google/cloud/bigtable/hbase/tools/HBaseSchemaTranslator.java +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/java/com/google/cloud/bigtable/hbase/tools/HBaseSchemaTranslator.java @@ -47,9 +47,8 @@ import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.exceptions.DeserializationException; -import org.apache.log4j.BasicConfigurator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * A utility to create tables in Cloud Bigtable based on the tables in an HBase cluster. @@ -102,7 +101,7 @@ public class HBaseSchemaTranslator { public static final String TABLE_NAME_FILTER_KEY = "google.bigtable.table.filter"; public static final String SCHEMA_MAPPING_FILEPATH = "google.bigtable.schema.mapping.filepath"; - private static final Logger LOG = LoggerFactory.getLogger(HBaseSchemaTranslator.class); + private static final Logger LOG = LogManager.getLogger(HBaseSchemaTranslator.class); private final SchemaReader schemaReader; private final SchemaTransformer schemaTransformer; @@ -537,9 +536,6 @@ private static void usage(final String errorMsg) { } public static void main(String[] args) throws IOException, DeserializationException { - // Configure the logger. - BasicConfigurator.configure(); - SchemaTranslationOptions options = SchemaTranslationOptions.loadOptionsFromSystemProperties(); HBaseSchemaTranslator translator = new HBaseSchemaTranslator(options); translator.translate(); diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j.properties b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j.properties deleted file mode 100644 index cdb5f1c103..0000000000 --- a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=INFO, file - -# Uncomment the following line to get detailed logs on Schema Translator -#log4j.logger.com.google.cloud.bigtable.hbase.tools.HBaseSchemaTranslator=trace diff --git a/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j2.xml b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j2.xml new file mode 100644 index 0000000000..4124800232 --- /dev/null +++ b/bigtable-hbase-1.x-parent/bigtable-hbase-1.x-tools/src/main/resources/log4j2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file