Updated Branches: refs/heads/branch-0.9 28f88c5fb -> 754bc183d
Merge pull request #590 from rxin/scalastyle. SPARK-1085: Fix Jenkins pull request builder for branch-0.9 (scalastyle command not found) Added a dummy scalastyle task to sbt. https://spark-project.atlassian.net/browse/SPARK-1085 Author: Reynold Xin <r...@apache.org> Closes #590 and squashes the following commits: d0889bd [Reynold Xin] SPARK-1085: Fix Jenkins pull request builder for branch-0.9 (scalastyle command not found) Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/754bc183 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/754bc183 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/754bc183 Branch: refs/heads/branch-0.9 Commit: 754bc183d9aeea2d3eaed0e5216b3e5aa49c2935 Parents: 28f88c5 Author: Reynold Xin <r...@apache.org> Authored: Wed Feb 12 14:26:39 2014 -0800 Committer: Aaron Davidson <aa...@databricks.com> Committed: Wed Feb 12 14:26:39 2014 -0800 ---------------------------------------------------------------------- project/SparkBuild.scala | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/754bc183/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 788ef12..6294d7d 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -65,6 +65,12 @@ object SparkBuild extends Build { lazy val assembleDeps = TaskKey[Unit]("assemble-deps", "Build assembly of dependencies and packages Spark projects") + // A dummy command so we can run the Jenkins pull request builder for older versions of Spark. + lazy val scalastyle = TaskKey[Unit]("scalastyle", "Dummy scalastyle check") + val scalastyleTask = scalastyle := { + println("scalastyle is not configured for this version of Spark project.") + } + // A configuration to set an alternative publishLocalConfiguration lazy val MavenCompile = config("m2r") extend(Compile) lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy") @@ -381,6 +387,7 @@ object SparkBuild extends Build { def assemblyProjSettings = sharedSettings ++ Seq( libraryDependencies += "net.sf.py4j" % "py4j" % "0.8.1", name := "spark-assembly", + scalastyleTask, assembleDeps in Compile <<= (packageProjects.map(packageBin in Compile in _) ++ Seq(packageDependency in Compile)).dependOn, jarName in assembly <<= version map { v => "spark-assembly-" + v + "-hadoop" + hadoopVersion + ".jar" }, jarName in packageDependency <<= version map { v => "spark-assembly-" + v + "-hadoop" + hadoopVersion + "-deps.jar" }
