Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52802188A1 for ; Thu, 12 Nov 2015 23:41:51 +0000 (UTC) Received: (qmail 30166 invoked by uid 500); 12 Nov 2015 23:41:51 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 30121 invoked by uid 500); 12 Nov 2015 23:41:51 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 30087 invoked by uid 99); 12 Nov 2015 23:41:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Nov 2015 23:41:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EE8F2E5E35; Thu, 12 Nov 2015 23:41:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hashutosh@apache.org To: commits@hive.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-12289 : Make sure slf4j-log4j12 jar is not in classpath (Ashutosh Chauhan via Prasanth J) Date: Thu, 12 Nov 2015 23:41:50 +0000 (UTC) Repository: hive Updated Branches: refs/heads/master 62e764f49 -> 1f7d48ede HIVE-12289 : Make sure slf4j-log4j12 jar is not in classpath (Ashutosh Chauhan via Prasanth J) Signed-off-by: Ashutosh Chauhan Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1f7d48ed Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1f7d48ed Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1f7d48ed Branch: refs/heads/master Commit: 1f7d48ede6384f11c4431d80f489525473661664 Parents: 62e764f Author: Ashutosh Chauhan Authored: Wed Oct 28 17:23:16 2015 -0700 Committer: Ashutosh Chauhan Committed: Thu Nov 12 14:58:46 2015 -0800 ---------------------------------------------------------------------- accumulo-handler/pom.xml | 12 ++- common/pom.xml | 24 ++++- .../apache/hadoop/hive/common/JavaUtils.java | 11 +-- hbase-handler/pom.xml | 44 ++++++++- hcatalog/core/pom.xml | 64 ++++++++++++- hcatalog/hcatalog-pig-adapter/pom.xml | 24 ++++- hcatalog/streaming/pom.xml | 20 ++++ hcatalog/webhcat/svr/pom.xml | 12 ++- hwi/pom.xml | 12 ++- itests/hcatalog-unit/pom.xml | 48 +++++++++- itests/hive-minikdc/pom.xml | 48 +++++++++- itests/hive-unit-hadoop2/pom.xml | 42 ++++++++- itests/hive-unit/pom.xml | 96 +++++++++++++++++++- .../metastore/hbase/TestHBaseSchemaTool.java | 6 +- .../metastore/hbase/TestHBaseSchemaTool2.java | 4 +- itests/qtest-accumulo/pom.xml | 84 +++++++++++++++-- itests/qtest-spark/pom.xml | 50 ++++++++++ itests/qtest/pom.xml | 72 +++++++++++++-- itests/util/pom.xml | 24 ++++- llap-client/pom.xml | 24 ++++- llap-server/pom.xml | 58 +++++++++++- metastore/pom.xml | 36 +++++++- .../hive/metastore/hbase/HBaseSchemaTool.java | 4 - pom.xml | 46 +++++++++- ql/pom.xml | 76 ++++++++++++++-- .../hive/ql/exec/mr/HadoopJobExecHelper.java | 11 +-- serde/pom.xml | 24 ++++- service/pom.xml | 12 ++- shims/0.23/pom.xml | 48 +++++++++- shims/common/pom.xml | 11 +-- spark-client/pom.xml | 12 ++- storage-api/pom.xml | 12 ++- 32 files changed, 975 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/accumulo-handler/pom.xml ---------------------------------------------------------------------- diff --git a/accumulo-handler/pom.xml b/accumulo-handler/pom.xml index 329bf66..759c718 100644 --- a/accumulo-handler/pom.xml +++ b/accumulo-handler/pom.xml @@ -91,7 +91,17 @@ hadoop-client ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index f9c5629..2292fdf 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -90,13 +90,33 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + com.google.code.tempus-fugit http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java ---------------------------------------------------------------------- diff --git a/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java b/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java index dc3a4ae..87bc99e 100644 --- a/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java +++ b/common/src/java/org/apache/hadoop/hive/common/JavaUtils.java @@ -27,8 +27,8 @@ import java.lang.reflect.Method; import java.net.URLClassLoader; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Collection of Java class loading/reflection related utilities common across @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory; */ public final class JavaUtils { - private static final Log LOG = LogFactory.getLog(JavaUtils.class); + private static final Logger LOG = LoggerFactory.getLogger(JavaUtils.class); private static final Method SUN_MISC_UTIL_RELEASE; static { @@ -56,10 +56,10 @@ public final class JavaUtils { /** * Standard way of getting classloader in Hive code (outside of Hadoop). - * + * * Uses the context loader to get access to classpaths to auxiliary and jars * added with 'add jar' command. Falls back to current classloader. - * + * * In Hadoop-related code, we use Configuration.getClassLoader(). */ public static ClassLoader getClassLoader() { @@ -133,7 +133,6 @@ public final class JavaUtils { newOutputStream.close(); } } - LogFactory.release(loader); } /** http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/hbase-handler/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-handler/pom.xml b/hbase-handler/pom.xml index 0f10580..6ff353d 100644 --- a/hbase-handler/pom.xml +++ b/hbase-handler/pom.xml @@ -50,6 +50,16 @@ hadoop-common ${hadoop.version} true + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -71,6 +81,16 @@ org.apache.hbase hbase-server ${hbase.version} + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hbase @@ -110,7 +130,17 @@ ${hbase.version} test-jar test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hbase hbase-hadoop-compat @@ -130,7 +160,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + junit junit http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/hcatalog/core/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/core/pom.xml b/hcatalog/core/pom.xml index 70297bf..63e4f30 100644 --- a/hcatalog/core/pom.xml +++ b/hcatalog/core/pom.xml @@ -92,11 +92,31 @@ org.apache.hadoop hadoop-common ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -116,6 +136,16 @@ ${hadoop.version} tests test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -129,20 +159,50 @@ hadoop-mapreduce-client-hs ${hadoop.version} test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-yarn-server-tests http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/hcatalog/hcatalog-pig-adapter/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/hcatalog-pig-adapter/pom.xml b/hcatalog/hcatalog-pig-adapter/pom.xml index fa02a36..87595e9 100644 --- a/hcatalog/hcatalog-pig-adapter/pom.xml +++ b/hcatalog/hcatalog-pig-adapter/pom.xml @@ -116,14 +116,34 @@ ${hadoop.version} true test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + com.sun.jersey jersey-servlet http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/hcatalog/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/streaming/pom.xml b/hcatalog/streaming/pom.xml index 39b3abd..e8dc4d8 100644 --- a/hcatalog/streaming/pom.xml +++ b/hcatalog/streaming/pom.xml @@ -78,6 +78,16 @@ hadoop-mapreduce-client-core true ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + @@ -93,6 +103,16 @@ hadoop-mapreduce-client-common test ${hadoop.version} + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/hcatalog/webhcat/svr/pom.xml ---------------------------------------------------------------------- diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml index 67d73ae..d7bd923 100644 --- a/hcatalog/webhcat/svr/pom.xml +++ b/hcatalog/webhcat/svr/pom.xml @@ -106,7 +106,17 @@ org.apache.hadoop hadoop-auth ${hadoop.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/hwi/pom.xml ---------------------------------------------------------------------- diff --git a/hwi/pom.xml b/hwi/pom.xml index 482ea2a..8507119 100644 --- a/hwi/pom.xml +++ b/hwi/pom.xml @@ -72,7 +72,17 @@ ${hadoop.version} true test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hive http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/hcatalog-unit/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hcatalog-unit/pom.xml b/itests/hcatalog-unit/pom.xml index ec48a4d..6fa25d5 100644 --- a/itests/hcatalog-unit/pom.xml +++ b/itests/hcatalog-unit/pom.xml @@ -131,14 +131,34 @@ hadoop-common ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs @@ -164,7 +184,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-yarn-server-tests @@ -182,7 +212,17 @@ hadoop-mapreduce-client-hs ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hbase hbase-client http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/hive-minikdc/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-minikdc/pom.xml b/itests/hive-minikdc/pom.xml index 6a20cad..906339d 100644 --- a/itests/hive-minikdc/pom.xml +++ b/itests/hive-minikdc/pom.xml @@ -135,7 +135,17 @@ hadoop-common ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs @@ -149,7 +159,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -161,7 +181,17 @@ hadoop-minikdc ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hbase hbase-server @@ -172,7 +202,17 @@ org.apache.hadoop hadoop-minicluster test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + com.sun.jersey jersey-servlet http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/hive-unit-hadoop2/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 006db5a..cd1cdb4 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -117,13 +117,33 @@ ${project.version} test-jar test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hive hive-it-unit ${project.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop @@ -143,6 +163,16 @@ ${hadoop.version} tests test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -160,6 +190,16 @@ org.apache.hadoop hadoop-minicluster test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + com.sun.jersey http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/hive-unit/pom.xml ---------------------------------------------------------------------- diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 0c61164..c202001 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -69,12 +69,32 @@ org.apache.hadoop hadoop-common ${hadoop.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-tests ${tez.version} test-jar + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + @@ -152,7 +172,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -190,6 +220,16 @@ org.apache.hadoop hadoop-minicluster test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + com.sun.jersey @@ -208,13 +248,33 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-hs ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-api @@ -226,6 +286,16 @@ tez-runtime-library ${tez.version} test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.tez @@ -238,6 +308,16 @@ tez-dag ${tez.version} test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -275,6 +355,14 @@ ${spark.version} test + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + com.esotericsoftware.kryo kryo http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool.java index d3b8615..24bebb8 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool.java @@ -19,8 +19,6 @@ package org.apache.hadoop.hive.metastore.hbase; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.metastore.api.ColumnStatistics; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsDesc; @@ -56,8 +54,8 @@ import java.util.Collections; import java.util.List; public class TestHBaseSchemaTool extends HBaseIntegrationTests { - private static final Log LOG = LogFactory.getLog(TestHBaseSchemaTool.class.getName()); - private String lsep = System.getProperty("line.separator"); + + private final String lsep = System.getProperty("line.separator"); @BeforeClass public static void startup() throws Exception { http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool2.java ---------------------------------------------------------------------- diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool2.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool2.java index e343035..0c95b2f 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool2.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/TestHBaseSchemaTool2.java @@ -18,8 +18,6 @@ package org.apache.hadoop.hive.metastore.hbase; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -32,7 +30,7 @@ import java.io.PrintStream; * This is in a separate class because install tests shouldn't set up the metastore first. */ public class TestHBaseSchemaTool2 extends HBaseIntegrationTests { - private static final Log LOG = LogFactory.getLog(TestHBaseSchemaTool.class.getName()); + private String lsep = System.getProperty("line.separator"); @BeforeClass http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/qtest-accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest-accumulo/pom.xml b/itests/qtest-accumulo/pom.xml index 6014639..7403a15 100644 --- a/itests/qtest-accumulo/pom.xml +++ b/itests/qtest-accumulo/pom.xml @@ -157,14 +157,34 @@ hadoop-common ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs @@ -184,13 +204,33 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-hs ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -279,19 +319,49 @@ tez-runtime-library ${tez.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-mapreduce ${tez.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-dag ${tez.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/qtest-spark/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index a0ccf66..fe16b45 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -51,6 +51,16 @@ spark-core_${scala.binary.version} ${spark.version} test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.eclipse.jetty @@ -164,6 +174,16 @@ hadoop-common ${hadoop.version} test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -171,6 +191,16 @@ ${hadoop.version} tests test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop @@ -191,12 +221,32 @@ ${hadoop.version} tests test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop hadoop-mapreduce-client-hs ${hadoop.version} test + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/qtest/pom.xml ---------------------------------------------------------------------- diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index cfa49ba..8db6fb0 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -135,14 +135,34 @@ hadoop-common ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-common ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-distcp @@ -168,13 +188,33 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-hs ${hadoop.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -276,7 +316,17 @@ tez-runtime-library ${tez.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-mapreduce @@ -288,7 +338,17 @@ tez-dag ${tez.version} test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/itests/util/pom.xml ---------------------------------------------------------------------- diff --git a/itests/util/pom.xml b/itests/util/pom.xml index 67e8e86..5bc5865 100644 --- a/itests/util/pom.xml +++ b/itests/util/pom.xml @@ -37,7 +37,17 @@ org.apache.accumulo accumulo-minicluster - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hive hive-accumulo-handler @@ -128,7 +138,17 @@ hadoop-mapreduce-client-jobclient ${hadoop.version} tests - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hbase hbase-server http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/llap-client/pom.xml ---------------------------------------------------------------------- diff --git a/llap-client/pom.xml b/llap-client/pom.xml index 0cd2ec9..3c85180 100644 --- a/llap-client/pom.xml +++ b/llap-client/pom.xml @@ -65,7 +65,17 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -103,7 +113,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/llap-server/pom.xml ---------------------------------------------------------------------- diff --git a/llap-server/pom.xml b/llap-server/pom.xml index a733e2c..ab4f5a4 100644 --- a/llap-server/pom.xml +++ b/llap-server/pom.xml @@ -90,19 +90,49 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-runtime-internals ${tez.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-runtime-library @@ -114,6 +144,16 @@ tez-mapreduce ${tez.version} true + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.tez @@ -128,7 +168,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/metastore/pom.xml ---------------------------------------------------------------------- diff --git a/metastore/pom.xml b/metastore/pom.xml index e3f825b..9da3bfb 100644 --- a/metastore/pom.xml +++ b/metastore/pom.xml @@ -59,7 +59,17 @@ org.apache.hbase hbase-client ${hbase.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + com.jolbox bonecp @@ -121,13 +131,33 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.thrift libfb303 http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseSchemaTool.java ---------------------------------------------------------------------- diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseSchemaTool.java b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseSchemaTool.java index 567970c..b4f8734 100644 --- a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseSchemaTool.java +++ b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseSchemaTool.java @@ -26,8 +26,6 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import java.io.PrintStream; @@ -40,8 +38,6 @@ import java.util.List; */ public class HBaseSchemaTool { - static final private Log LOG = LogFactory.getLog(HBaseReadWrite.class.getName()); - public static void main(String[] args) { Options options = new Options(); http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 99aeff7..4a90cef 100644 --- a/pom.xml +++ b/pom.xml @@ -495,7 +495,23 @@ zookeeper ${zookeeper.version} + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.httpcomponents + httpcore + + org.apache.httpcomponents + httpclient + + org.jboss.netty netty @@ -602,7 +618,11 @@ hadoop-common ${hadoop.version} - + + org.slf4j + slf4j-log4j12 + + commmons-logging commons-logging @@ -625,12 +645,32 @@ org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-minikdc http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/ql/pom.xml ---------------------------------------------------------------------- diff --git a/ql/pom.xml b/ql/pom.xml index 005c232..9420a62 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -90,7 +90,17 @@ commons-httpclient commons-httpclient ${commons-httpclient.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + commons-io commons-io @@ -168,7 +178,15 @@ hadoop-common ${hadoop.version} - + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + javax.servlet servlet-api @@ -193,7 +211,17 @@ ${hadoop.version} true test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs @@ -471,7 +499,15 @@ org.apache.hadoop hadoop-yarn-client - + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.tez @@ -479,7 +515,15 @@ ${tez.version} true - + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.hadoop hadoop-common @@ -503,7 +547,15 @@ org.apache.hadoop hadoop-yarn-client - + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + org.apache.tez @@ -542,7 +594,17 @@ spark-core_${scala.binary.version} ${spark.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + com.sun.jersey jersey-servlet http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java index 44dfe3e..5f35630 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java @@ -30,8 +30,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.ql.MapRedStats; @@ -61,10 +59,11 @@ import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.appender.FileAppender; import org.apache.logging.log4j.core.appender.RollingFileAppender; +import org.slf4j.LoggerFactory; public class HadoopJobExecHelper { - static final private Log LOG = LogFactory.getLog(HadoopJobExecHelper.class.getName()); + static final private org.slf4j.Logger LOG = LoggerFactory.getLogger(HadoopJobExecHelper.class.getName()); protected transient JobConf job; protected Task task; @@ -76,8 +75,8 @@ public class HadoopJobExecHelper { protected transient int lastReduceProgress; public transient JobID jobId; - private LogHelper console; - private HadoopJobExecHook callBackObj; + private final LogHelper console; + private final HadoopJobExecHook callBackObj; /** * Update counters relevant to this task. @@ -186,7 +185,7 @@ public class HadoopJobExecHelper { System.err.println("killing job with: " + rj.getID()); rj.killJob(); } catch (Exception e) { - LOG.warn(e); + LOG.warn("Failed to kill job", e); System.err.println("Failed to kill job: "+ rj.getID()); // do nothing } http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/serde/pom.xml ---------------------------------------------------------------------- diff --git a/serde/pom.xml b/serde/pom.xml index 772ce71..4e854c2 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -85,7 +85,17 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-core @@ -124,7 +134,17 @@ ${hadoop.version} tests test - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/service/pom.xml ---------------------------------------------------------------------- diff --git a/service/pom.xml b/service/pom.xml index 7095448..22234d9 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -59,7 +59,17 @@ net.sf.jpam jpam ${jpam.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + commons-lang http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/shims/0.23/pom.xml ---------------------------------------------------------------------- diff --git a/shims/0.23/pom.xml b/shims/0.23/pom.xml index 17efde8..9009762 100644 --- a/shims/0.23/pom.xml +++ b/shims/0.23/pom.xml @@ -51,7 +51,17 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-hdfs @@ -70,14 +80,34 @@ hadoop-mapreduce-client-core ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.hadoop hadoop-mapreduce-client-jobclient ${hadoop.version} test-jar true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-api @@ -89,7 +119,17 @@ tez-runtime-library ${tez.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + org.apache.tez tez-mapreduce http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/shims/common/pom.xml ---------------------------------------------------------------------- diff --git a/shims/common/pom.xml b/shims/common/pom.xml index 001c96b..ecfc294 100644 --- a/shims/common/pom.xml +++ b/shims/common/pom.xml @@ -37,11 +37,6 @@ org.apache.logging.log4j - log4j-1.2-api - ${log4j2.version} - - - org.apache.logging.log4j log4j-slf4j-impl ${log4j2.version} @@ -56,7 +51,11 @@ ${hadoop.version} true - + + org.slf4j + slf4j-log4j12 + + commmons-logging commons-logging http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/spark-client/pom.xml ---------------------------------------------------------------------- diff --git a/spark-client/pom.xml b/spark-client/pom.xml index 1d05720..a0bbe56 100644 --- a/spark-client/pom.xml +++ b/spark-client/pom.xml @@ -59,7 +59,17 @@ org.apache.spark spark-core_${scala.binary.version} ${spark.version} - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + junit junit http://git-wip-us.apache.org/repos/asf/hive/blob/1f7d48ed/storage-api/pom.xml ---------------------------------------------------------------------- diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 0af0d27..ae9da60 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -38,7 +38,17 @@ hadoop-common ${hadoop.version} true - + + + org.slf4j + slf4j-log4j12 + + + commmons-logging + commons-logging + + + junit junit