You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/07/01 21:33:30 UTC
spark git commit: [SPARK-7820] [BUILD] Fix Java8-tests suite compile
and test error under sbt
Repository: spark
Updated Branches:
refs/heads/master 75b9fe4c5 -> 9f7db3486
[SPARK-7820] [BUILD] Fix Java8-tests suite compile and test error under sbt
Author: jerryshao <sa...@intel.com>
Closes #7120 from jerryshao/SPARK-7820 and squashes the following commits:
6902439 [jerryshao] fix Java8-tests suite compile error under sbt
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9f7db348
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9f7db348
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9f7db348
Branch: refs/heads/master
Commit: 9f7db3486fcb403cae8da9dfce8978373c3f47b7
Parents: 75b9fe4
Author: jerryshao <sa...@intel.com>
Authored: Wed Jul 1 12:33:24 2015 -0700
Committer: Josh Rosen <jo...@databricks.com>
Committed: Wed Jul 1 12:33:24 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/9f7db348/extras/java8-tests/pom.xml
----------------------------------------------------------------------
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index f138251..3636a90 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/9f7db348/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 4ef4dc8..5f389bc 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") }
)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org