Permalink
Browse files

Upgraded hive-unit-mr2 and minioozie to CDH-5.8.3

  • Loading branch information...
utzwestermann committed Oct 23, 2016
1 parent 04ddb68 commit 7e23e7ed2c526569555ec58fc8b3f55d6419fce0
View
@@ -18,4 +18,5 @@ test-classes
.DS_Store
build/
.fbExcludeFilterFile
.java-version
.java-version
MRAppJar.jar
View
@@ -23,8 +23,8 @@
<pig.parquet.version>1.6.0</pig.parquet.version>
<spark.version>1.6.0-cdh5.8.3</spark.version>
<mrunit.version>1.1.0</mrunit.version>
<hiveunit.version>1.2.3</hiveunit.version>
<minioozie.version>1.2.1</minioozie.version>
<hiveunit.version>1.2.4</hiveunit.version>
<minioozie.version>1.2.2</minioozie.version>
<schedoscope.version>0.7.0-SNAPSHOT</schedoscope.version>
</properties>
@@ -18,20 +18,28 @@
<artifactId>schedoscope-core</artifactId>
<version>${schedoscope.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-launcher_${scala.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_${scala.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_${scala.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.version}</artifactId>
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
@@ -84,23 +84,25 @@ class SparkDriver(val driverRunCompletionHandlerClassNames: List[String]) extend
l.setChildEnv(k, v.toString)
}
l.setConf(DRIVER_EXTRA_CLASSPATH, Settings().getDriverSettings(t).libDirectory + (
if (l.getConf(DRIVER_EXTRA_CLASSPATH) != null)
File.pathSeparator + l.getConf(DRIVER_EXTRA_CLASSPATH)
else
""
if (!master.startsWith("local")) {
l.setConf(DRIVER_EXTRA_CLASSPATH, Settings().getDriverSettings(t).libDirectory + (
if (l.getConf(DRIVER_EXTRA_CLASSPATH) != null)
File.pathSeparator + l.getConf(DRIVER_EXTRA_CLASSPATH)
else
""
)
)
)
l.setConf(EXECUTOR_EXTRA_CLASSPATH, Settings().getDriverSettings(t).libDirectory + (
if (l.getConf(EXECUTOR_EXTRA_CLASSPATH) != null)
File.pathSeparator + l.getConf(EXECUTOR_EXTRA_CLASSPATH)
else
""
l.setConf(EXECUTOR_EXTRA_CLASSPATH, Settings().getDriverSettings(t).libDirectory + (
if (l.getConf(EXECUTOR_EXTRA_CLASSPATH) != null)
File.pathSeparator + l.getConf(EXECUTOR_EXTRA_CLASSPATH)
else
""
)
)
)
if (master.startsWith("local"))
} else
l.setLocalTestMode()
}

0 comments on commit 7e23e7e

Please sign in to comment.