diff options
| author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-22 08:01:13 +0530 |
|---|---|---|
| committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-22 08:01:13 +0530 |
| commit | 7acab3ab45df421601ee9a076a61de00561a0308 (patch) | |
| tree | ee2e9264e72bfd10e878c09765b5d580e382aca7 /project/SparkBuild.scala | |
| parent | ac2e8e8720f10efd640a67ad85270719ab2d43e9 (diff) | |
| download | spark-7acab3ab45df421601ee9a076a61de00561a0308.tar.gz spark-7acab3ab45df421601ee9a076a61de00561a0308.tar.bz2 spark-7acab3ab45df421601ee9a076a61de00561a0308.zip | |
Fix review comments, add a new api to SparkHadoopUtil to create appropriate Configuration. Modify an example to show how to use SplitInfo
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 91e3123bc5..0a5b89d927 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -47,10 +47,8 @@ object SparkBuild extends Build { scalacOptions := Seq("-unchecked", "-optimize", "-deprecation"), unmanagedJars in Compile <<= baseDirectory map { base => (base / "lib" ** "*.jar").classpath }, retrieveManaged := true, - // retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]", transitiveClassifiers in Scope.GlobalScope := Seq("sources"), - // For some reason this fails on some nodes and works on others - not yet debugged why - // testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))), + testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))), // shared between both core and streaming. resolvers ++= Seq("Akka Repository" at "http://repo.akka.io/releases/"), @@ -170,7 +168,11 @@ object SparkBuild extends Build { Seq("org.apache.hadoop" % "hadoop-core" % HADOOP_VERSION) }), unmanagedSourceDirectories in Compile <+= baseDirectory{ _ / - ( if (HADOOP_YARN && HADOOP_MAJOR_VERSION == "2") "src/hadoop2-yarn/scala" else "src/hadoop" + HADOOP_MAJOR_VERSION + "/scala" ) + ( if (HADOOP_YARN && HADOOP_MAJOR_VERSION == "2") { + "src/hadoop2-yarn/scala" + } else { + "src/hadoop" + HADOOP_MAJOR_VERSION + "/scala" + } ) } ) ++ assemblySettings ++ extraAssemblySettings ++ Twirl.settings |