You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/06/24 08:04:04 UTC
spark git commit: [HOTFIX] [BUILD] Fix MiMa checks in master branch;
enable MiMa for launcher project
Repository: spark
Updated Branches:
refs/heads/master 50c3a86f4 -> 13ae806b2
[HOTFIX] [BUILD] Fix MiMa checks in master branch; enable MiMa for launcher project
This commit changes the MiMa tests to test against the released 1.4.0 artifacts rather than 1.4.0-rc4; this change is necessary to fix a Jenkins build break since it seems that the RC4 snapshot is no longer available via Maven.
I also enabled MiMa checks for the `launcher` subproject, which we should have done right after 1.4.0 was released.
Author: Josh Rosen <jo...@databricks.com>
Closes #6974 from JoshRosen/mima-hotfix and squashes the following commits:
4b4175a [Josh Rosen] [HOTFIX] [BUILD] Fix MiMa checks in master branch; enable MiMa for launcher project
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/13ae806b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/13ae806b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/13ae806b
Branch: refs/heads/master
Commit: 13ae806b255cfb2bd5470b599a95c87a2cd5e978
Parents: 50c3a86
Author: Josh Rosen <jo...@databricks.com>
Authored: Tue Jun 23 23:03:59 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Tue Jun 23 23:03:59 2015 -0700
----------------------------------------------------------------------
project/MimaBuild.scala | 3 +--
project/SparkBuild.scala | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/13ae806b/project/MimaBuild.scala
----------------------------------------------------------------------
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala
index 5812b72..f16bf98 100644
--- a/project/MimaBuild.scala
+++ b/project/MimaBuild.scala
@@ -91,8 +91,7 @@ object MimaBuild {
def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
val organization = "org.apache.spark"
- // TODO: Change this once Spark 1.4.0 is released
- val previousSparkVersion = "1.4.0-rc4"
+ val previousSparkVersion = "1.4.0"
val fullId = "spark-" + projectRef.project + "_2.10"
mimaDefaultSettings ++
Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),
http://git-wip-us.apache.org/repos/asf/spark/blob/13ae806b/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e017202..f5f1c9a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -166,9 +166,8 @@ object SparkBuild extends PomBuild {
/* Enable tests settings for all projects except examples, assembly and tools */
(allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings))
- // TODO: remove launcher from this list after 1.4.0
allProjects.filterNot(x => Seq(spark, hive, hiveThriftServer, catalyst, repl,
- networkCommon, networkShuffle, networkYarn, launcher, unsafe).contains(x)).foreach {
+ networkCommon, networkShuffle, networkYarn, unsafe).contains(x)).foreach {
x => enable(MimaBuild.mimaSettings(sparkHome, x))(x)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org