Repository: spark Updated Branches: refs/heads/branch-1.3 4cfc02531 -> d6f31e0c7
[SPARK-5700] [SQL] [Build] Bumps jets3t to 0.9.3 for hadoop-2.3 and hadoop-2.4 profiles This is a follow-up PR for #4454 and #4484. JetS3t 0.9.2 contains a log4j.properties file inside the artifact and breaks our tests (see SPARK-5696). This is fixed in 0.9.3. This PR also reverts hotfix changes introduced in #4484. The reason is that asking users to configure HiveThriftServer2 logging configurations in hive-log4j.properties can be unintuitive. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png"; height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/apache/spark/4499) <!-- Reviewable:end --> Author: Cheng Lian <l...@databricks.com> Closes #4499 from liancheng/spark-5700 and squashes the following commits: 4f020c7 [Cheng Lian] Bumps jets3t to 0.9.3 for hadoop-2.3 and hadoop-2.4 profiles (cherry picked from commit ba667935f8670293f10b8bbe1e317b28d00f9875) Signed-off-by: Cheng Lian <l...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d6f31e0c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d6f31e0c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d6f31e0c Branch: refs/heads/branch-1.3 Commit: d6f31e0c72f69076e71c9d32d2aac13c44b20b22 Parents: 4cfc025 Author: Cheng Lian <l...@databricks.com> Authored: Tue Feb 10 02:28:47 2015 -0800 Committer: Cheng Lian <l...@databricks.com> Committed: Tue Feb 10 02:29:18 2015 -0800 ---------------------------------------------------------------------- pom.xml | 4 ++-- .../apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d6f31e0c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a9e968a..56e37d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1578,7 +1578,7 @@ <properties> <hadoop.version>2.3.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> - <jets3t.version>0.9.2</jets3t.version> + <jets3t.version>0.9.3</jets3t.version> <hbase.version>0.98.7-hadoop2</hbase.version> <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> @@ -1591,7 +1591,7 @@ <properties> <hadoop.version>2.4.0</hadoop.version> <protobuf.version>2.5.0</protobuf.version> - <jets3t.version>0.9.2</jets3t.version> + <jets3t.version>0.9.3</jets3t.version> <hbase.version>0.98.7-hadoop2</hbase.version> <commons.math3.version>3.1.1</commons.math3.version> <avro.mapred.classifier>hadoop2</avro.mapred.classifier> http://git-wip-us.apache.org/repos/asf/spark/blob/d6f31e0c/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala ---------------------------------------------------------------------- diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala index 525777a..6e07df1 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala @@ -18,7 +18,6 @@ package org.apache.spark.sql.hive.thriftserver import org.apache.commons.logging.LogFactory -import org.apache.hadoop.hive.common.LogUtils import org.apache.hadoop.hive.conf.HiveConf import org.apache.hadoop.hive.conf.HiveConf.ConfVars import org.apache.hive.service.cli.thrift.{ThriftBinaryCLIService, ThriftHttpCLIService} @@ -55,8 +54,6 @@ object HiveThriftServer2 extends Logging { System.exit(-1) } - LogUtils.initHiveLog4j() - logInfo("Starting SparkContext") SparkSQLEnv.init() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
![https://reviewable.io/review_button.png"](https://reviewable.io/review_button.png"){kind=link}