Skip to content

Commit

Permalink
[SPARK-7820] [BUILD] Fix Java8-tests suite compile and test error und…
Browse files Browse the repository at this point in the history
…er sbt

Author: jerryshao <[email protected]>

Closes apache#7120 from jerryshao/SPARK-7820 and squashes the following commits:

6902439 [jerryshao] fix Java8-tests suite compile error under sbt
  • Loading branch information
jerryshao authored and JoshRosen committed Jul 1, 2015
1 parent 75b9fe4 commit 9f7db34
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions extras/java8-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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") }
)
Expand Down

0 comments on commit 9f7db34

Please sign in to comment.