Skip to content

Commit bcfb37b

Browse files
jerryshaoJoshRosen
authored andcommitted
[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 9f7db34) Signed-off-by: Josh Rosen <joshrosen@databricks.com>
1 parent 2f85d8e commit bcfb37b

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

extras/java8-tests/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@
3939
<artifactId>spark-core_${scala.binary.version}</artifactId>
4040
<version>${project.version}</version>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.apache.spark</groupId>
44+
<artifactId>spark-core_${scala.binary.version}</artifactId>
45+
<version>${project.version}</version>
46+
<type>test-jar</type>
47+
<scope>test</scope>
48+
</dependency>
4249
<dependency>
4350
<groupId>org.apache.spark</groupId>
4451
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
@@ -49,6 +56,7 @@
4956
<artifactId>spark-streaming_${scala.binary.version}</artifactId>
5057
<version>${project.version}</version>
5158
<type>test-jar</type>
59+
<scope>test</scope>
5260
</dependency>
5361
<dependency>
5462
<groupId>junit</groupId>

project/SparkBuild.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ object SparkBuild extends PomBuild {
157157
// Note ordering of these settings matter.
158158
/* Enable shared settings on all projects */
159159
(allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark, tools))
160-
.foreach(enable(sharedSettings ++ ExludedDependencies.settings))
160+
.foreach(enable(sharedSettings ++ ExcludedDependencies.settings))
161161

162162
/* Enable tests settings for all projects except examples, assembly and tools */
163163
(allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings))
@@ -246,7 +246,7 @@ object Flume {
246246
This excludes library dependencies in sbt, which are specified in maven but are
247247
not needed by sbt build.
248248
*/
249-
object ExludedDependencies {
249+
object ExcludedDependencies {
250250
lazy val settings = Seq(
251251
libraryDependencies ~= { libs => libs.filterNot(_.name == "groovy-all") }
252252
)

0 commit comments

Comments
 (0)