Repository: spark Updated Branches: refs/heads/branch-1.4 2f85d8ee0 -> bcfb37bf6
[SPARK-7820] [BUILD] Fix Java8-tests suite compile and test error under sbt Author: jerryshao <saisai.s...@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 <joshro...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bcfb37bf Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bcfb37bf Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bcfb37bf Branch: refs/heads/branch-1.4 Commit: bcfb37bf6987f15be7d1c48ef97f1630e3481af8 Parents: 2f85d8e Author: jerryshao <saisai.s...@intel.com> Authored: Wed Jul 1 12:33:24 2015 -0700 Committer: Josh Rosen <joshro...@databricks.com> Committed: Wed Jul 1 12:34:38 2015 -0700 ---------------------------------------------------------------------- extras/java8-tests/pom.xml | 8 ++++++++ project/SparkBuild.scala | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/bcfb37bf/extras/java8-tests/pom.xml ---------------------------------------------------------------------- diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml index 06f9b64..e249b56 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> http://git-wip-us.apache.org/repos/asf/spark/blob/bcfb37bf/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index bd0cf33..aa59d74 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") } ) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
