From 9f7db3486fcb403cae8da9dfce8978373c3f47b7 Mon Sep 17 00:00:00 2001
From: jerryshao <saisai.shao@intel.com>
Date: Wed, 1 Jul 2015 12:33:24 -0700
Subject: [PATCH] [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
---
extras/java8-tests/pom.xml | 8 ++++++++
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 f138251748..3636a9037d 100644
--- a/extras/java8-tests/pom.xml
+++ b/extras/java8-tests/pom.xml
@@ -39,6 +39,13 @@
<artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</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>
@@ -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 4ef4dc8bdc..5f389bcc9c 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -161,7 +161,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 ++ Revolver.settings))
+ .foreach(enable(sharedSettings ++ ExcludedDependencies.settings ++ Revolver.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") }
)
--
GitLab