Skip to content

[HOTFIX] Fix broken Mima tests on the master branch #2315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JoshRosen wants to merge 3 commits into from
Closed

[HOTFIX] Fix broken Mima tests on the master branch #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57569be
Fix MiMa tests in master branch; test against 1.1.0 RC.
JoshRosen Sep 8, 2014
ec90e21
Add deploy and graphx to 1.2 MiMa excludes.
JoshRosen Sep 8, 2014
776bc2c
Add two excludes to workaround Mima annotation issues.
JoshRosen Sep 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@
<enabled>false</enabled>
</snapshots>
</repository>
<!-- TODO: remove this as soon as 1.1.0 is published on Maven central -->
<repository>
<id>spark-staging-1030</id>
<name>Spark 1.1.0 Staging (1030)</name>
<url>https://repository.apache.org/content/repositories/orgapachespark-1030/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand Down
2 changes: 1 addition & 1 deletion project/MimaBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ object MimaBuild {

def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
val organization = "org.apache.spark"
val previousSparkVersion = "1.0.0"
val previousSparkVersion = "1.1.0"
val fullId = "spark-" + projectRef.project + "_2.10"
mimaDefaultSettings ++
Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),
Expand Down
12 changes: 12 additions & 0 deletions project/MimaExcludes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ import com.typesafe.tools.mima.core._
object MimaExcludes {
def excludes(version: String) =
version match {
case v if v.startsWith("1.2") =>
Seq(
MimaBuild.excludeSparkPackage("deploy"),
Copy link

@SparkQA SparkQA Sep 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you just pull this into an exclude that is always run rather than version-specific? This is simply not part of the Spark API and is separately excluded from other stuff too.

Copy link
Contributor Author

@JoshRosen JoshRosen Sep 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, we could refactor this, but I was trying to scope this patch to a hotfix for the current test failures rather than more general organization / cleanup. I'll loop back to do this when addressing other Mima issues tomorrow.

MimaBuild.excludeSparkPackage("graphx")
) ++
// This is @DeveloperAPI, but Mima still gives false-positives:
MimaBuild.excludeSparkClass("scheduler.SparkListenerApplicationStart") ++
Seq(
// This is @Experimental, but Mima still gives false-positives:
ProblemFilters.exclude[MissingMethodProblem](
"org.apache.spark.api.java.JavaRDDLike.foreachAsync")
)
case v if v.startsWith("1.1") =>
Seq(
MimaBuild.excludeSparkPackage("deploy"),
Expand Down