Repository: spark Updated Branches: refs/heads/master 3e63d98f0 -> 1fa48d942
SPARK-1325. The maven build error for Spark Tools This is just a slight variation on https://github.com/apache/spark/pull/234 and alternative suggestion for SPARK-1325. `scala-actors` is not necessary. `SparkBuild.scala` should be updated to reflect the direct dependency on `scala-reflect` and `scala-compiler`. And the `repl` build, which has the same dependencies, should also be consistent between Maven / SBT. Author: Sean Owen <so...@cloudera.com> Author: witgo <wi...@qq.com> Closes #240 from srowen/SPARK-1325 and squashes the following commits: 25bd7db [Sean Owen] Add necessary dependencies scala-reflect and scala-compiler to tools. Update repl dependencies, which are similar, to be consistent between Maven / SBT in this regard too. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1fa48d94 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1fa48d94 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1fa48d94 Branch: refs/heads/master Commit: 1fa48d9422d543827011eec0cdf12d060b78a7c7 Parents: 3e63d98 Author: Sean Owen <so...@cloudera.com> Authored: Wed Mar 26 18:31:52 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Wed Mar 26 18:32:14 2014 -0700 ---------------------------------------------------------------------- pom.xml | 5 +++++ project/SparkBuild.scala | 4 +++- repl/pom.xml | 5 +++++ tools/pom.xml | 8 ++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1fa48d94/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index deb89b1..f0644ed 100644 --- a/pom.xml +++ b/pom.xml @@ -421,6 +421,11 @@ </dependency> <dependency> <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <version>${scala.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> <artifactId>jline</artifactId> <version>${scala.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fa48d94/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 60f14ba..9e269e6 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -356,7 +356,9 @@ object SparkBuild extends Build { ) ++ assemblySettings ++ extraAssemblySettings def toolsSettings = sharedSettings ++ Seq( - name := "spark-tools" + name := "spark-tools", + libraryDependencies <+= scalaVersion(v => "org.scala-lang" % "scala-compiler" % v ), + libraryDependencies <+= scalaVersion(v => "org.scala-lang" % "scala-reflect" % v ) ) ++ assemblySettings ++ extraAssemblySettings def graphxSettings = sharedSettings ++ Seq( http://git-wip-us.apache.org/repos/asf/spark/blob/1fa48d94/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index fc49c8b..78d2fe1 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -79,6 +79,11 @@ </dependency> <dependency> <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <version>${scala.version}</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> <artifactId>jline</artifactId> <version>${scala.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/spark/blob/1fa48d94/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index 11433e5..ae2ba64 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -56,6 +56,14 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-compiler</artifactId> + </dependency> + <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.binary.version}</artifactId> <scope>test</scope>
