Repository: hive Updated Branches: refs/heads/master 21865352e -> 4b4580a42
HIVE-14445 : upgrade maven surefire to 2.19.1 (Zoltan Haindrich via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4b4580a4 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4b4580a4 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4b4580a4 Branch: refs/heads/master Commit: 4b4580a4270bc69a43fc0c087475629128a023c3 Parents: 2186535 Author: Zoltan Haindrich <[email protected]> Authored: Fri Aug 12 11:57:26 2016 -0700 Committer: Ashutosh Chauhan <[email protected]> Committed: Fri Aug 12 11:58:17 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/hive/spark/client/SparkClientImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/4b4580a4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1365f91..93a877e 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ <maven.jar.plugin.version>2.2</maven.jar.plugin.version> <maven.javadoc.plugin.version>2.4</maven.javadoc.plugin.version> <maven.shade.plugin.version>2.2</maven.shade.plugin.version> - <maven.surefire.plugin.version>2.16</maven.surefire.plugin.version> + <maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version> <maven.war.plugin.version>2.4</maven.war.plugin.version> <maven.dependency.plugin.version>2.8</maven.dependency.plugin.version> <maven.eclipse.plugin.version>2.9</maven.eclipse.plugin.version> http://git-wip-us.apache.org/repos/asf/hive/blob/4b4580a4/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java ---------------------------------------------------------------------- diff --git a/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java b/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java index 377b24d..e8ca42a 100644 --- a/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java +++ b/spark-client/src/main/java/org/apache/hive/spark/client/SparkClientImpl.java @@ -235,12 +235,12 @@ class SparkClientImpl implements SparkClient { // If a Spark installation is provided, use the spark-submit script. Otherwise, call the // SparkSubmit class directly, which has some caveats (like having to provide a proper // version of Guava on the classpath depending on the deploy mode). - String sparkHome = conf.get(SPARK_HOME_KEY); + String sparkHome = Strings.emptyToNull(conf.get(SPARK_HOME_KEY)); if (sparkHome == null) { - sparkHome = System.getenv(SPARK_HOME_ENV); + sparkHome = Strings.emptyToNull(System.getenv(SPARK_HOME_ENV)); } if (sparkHome == null) { - sparkHome = System.getProperty(SPARK_HOME_KEY); + sparkHome = Strings.emptyToNull(System.getProperty(SPARK_HOME_KEY)); } String sparkLogDir = conf.get("hive.spark.log.dir"); if (sparkLogDir == null) {
