diff options
| author | Sean Owen <sowen@cloudera.com> | 2014-03-26 18:31:52 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-03-26 18:32:14 -0700 |
| commit | 1fa48d9422d543827011eec0cdf12d060b78a7c7 (patch) | |
| tree | 73169d383a787f720e09d501c0d6df15ca9e9c4f | |
| parent | 3e63d98f09065386901d78c141b0da93cdce0f76 (diff) | |
| download | spark-1fa48d9422d543827011eec0cdf12d060b78a7c7.tar.gz spark-1fa48d9422d543827011eec0cdf12d060b78a7c7.tar.bz2 spark-1fa48d9422d543827011eec0cdf12d060b78a7c7.zip | |
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 <sowen@cloudera.com>
Author: witgo <witgo@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.
| -rw-r--r-- | pom.xml | 5 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 4 | ||||
| -rw-r--r-- | repl/pom.xml | 5 | ||||
| -rw-r--r-- | tools/pom.xml | 8 |
4 files changed, 21 insertions, 1 deletions
@@ -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> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 60f14ba37e..9e269e6551 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( diff --git a/repl/pom.xml b/repl/pom.xml index fc49c8b811..78d2fe13c2 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> diff --git a/tools/pom.xml b/tools/pom.xml index 11433e596f..ae2ba64e07 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> |