diff options
| author | Josh Rosen <joshrosen@databricks.com> | 2015-06-23 23:03:59 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-06-23 23:03:59 -0700 |
| commit | 13ae806b255cfb2bd5470b599a95c87a2cd5e978 (patch) | |
| tree | 561905e27af2ab6c33235f2d6a5d0d99fae0ab08 | |
| parent | 50c3a86f42d7dfd1acbda65c1e5afbd3db1406df (diff) | |
| download | spark-13ae806b255cfb2bd5470b599a95c87a2cd5e978.tar.gz spark-13ae806b255cfb2bd5470b599a95c87a2cd5e978.tar.bz2 spark-13ae806b255cfb2bd5470b599a95c87a2cd5e978.zip | |
[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 <joshrosen@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
| -rw-r--r-- | project/MimaBuild.scala | 3 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index 5812b72f0a..f16bf989f2 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), diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index e01720296f..f5f1c9a1a2 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) } |