Skip to content
Snippets Groups Projects
Commit 9f7db348 authored by jerryshao's avatar jerryshao Committed by Josh Rosen
Browse files

[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
parent 75b9fe4c
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,13 @@ ...@@ -39,6 +39,13 @@
<artifactId>spark-core_${scala.binary.version}</artifactId> <artifactId>spark-core_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </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> <dependency>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-streaming_${scala.binary.version}</artifactId> <artifactId>spark-streaming_${scala.binary.version}</artifactId>
...@@ -49,6 +56,7 @@ ...@@ -49,6 +56,7 @@
<artifactId>spark-streaming_${scala.binary.version}</artifactId> <artifactId>spark-streaming_${scala.binary.version}</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
......
...@@ -161,7 +161,7 @@ object SparkBuild extends PomBuild { ...@@ -161,7 +161,7 @@ object SparkBuild extends PomBuild {
// Note ordering of these settings matter. // Note ordering of these settings matter.
/* Enable shared settings on all projects */ /* Enable shared settings on all projects */
(allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark, tools)) (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 */ /* Enable tests settings for all projects except examples, assembly and tools */
(allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings)) (allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings))
...@@ -246,7 +246,7 @@ object Flume { ...@@ -246,7 +246,7 @@ object Flume {
This excludes library dependencies in sbt, which are specified in maven but are This excludes library dependencies in sbt, which are specified in maven but are
not needed by sbt build. not needed by sbt build.
*/ */
object ExludedDependencies { object ExcludedDependencies {
lazy val settings = Seq( lazy val settings = Seq(
libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") } libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") }
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment