diff options
| author | jerryshao <saisai.shao@intel.com> | 2015-07-01 12:33:24 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2015-07-01 12:34:38 -0700 |
| commit | bcfb37bf6987f15be7d1c48ef97f1630e3481af8 (patch) | |
| tree | d25862bb6d851428d07f6a93265e4bb482861a5f | |
| parent | 2f85d8ee0c8106c99b9994bf0de2b86233c3f4b4 (diff) | |
| download | spark-bcfb37bf6987f15be7d1c48ef97f1630e3481af8.tar.gz spark-bcfb37bf6987f15be7d1c48ef97f1630e3481af8.tar.bz2 spark-bcfb37bf6987f15be7d1c48ef97f1630e3481af8.zip | |
[SPARK-7820] [BUILD] Fix Java8-tests suite compile and test error under sbt
Author: jerryshao <saisai.shao@intel.com>
Closes #7120 from jerryshao/SPARK-7820 and squashes the following commits:
6902439 [jerryshao] fix Java8-tests suite compile error under sbt
(cherry picked from commit 9f7db3486fcb403cae8da9dfce8978373c3f47b7)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
| -rw-r--r-- | extras/java8-tests/pom.xml | 8 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index 06f9b64241..e249b5630e 100644 --- a/extras/java8-tests/pom.xml +++ b/extras/java8-tests/pom.xml @@ -41,6 +41,13 @@ </dependency> <dependency> <groupId>org.apache.spark</groupId> + <artifactId>spark-core_${scala.binary.version}</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.spark</groupId> <artifactId>spark-streaming_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -49,6 +56,7 @@ <artifactId>spark-streaming_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId> diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index bd0cf33044..aa59d74cf4 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -157,7 +157,7 @@ object SparkBuild extends PomBuild { // Note ordering of these settings matter. /* Enable shared settings on all projects */ (allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark, tools)) - .foreach(enable(sharedSettings ++ ExludedDependencies.settings)) + .foreach(enable(sharedSettings ++ ExcludedDependencies.settings)) /* Enable tests settings for all projects except examples, assembly and tools */ (allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings)) @@ -246,7 +246,7 @@ object Flume { This excludes library dependencies in sbt, which are specified in maven but are not needed by sbt build. */ -object ExludedDependencies { +object ExcludedDependencies { lazy val settings = Seq( libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") } ) |