diff options
| author | Prashant Sharma <prashant@apache.org> | 2014-09-15 21:14:00 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-09-15 21:14:00 -0700 |
| commit | ecf0c02935815f0d4018c0e30ec4c784e60a5db0 (patch) | |
| tree | 67c6932a37eeb0b8fecb8566a73efd4c3b98c59e /project | |
| parent | d428ac6a221d2dce19c43442abf197f2ade6658f (diff) | |
| download | spark-ecf0c02935815f0d4018c0e30ec4c784e60a5db0.tar.gz spark-ecf0c02935815f0d4018c0e30ec4c784e60a5db0.tar.bz2 spark-ecf0c02935815f0d4018c0e30ec4c784e60a5db0.zip | |
[SPARK-3433][BUILD] Fix for Mima false-positives with @DeveloperAPI and @Experimental annotations.
Actually false positive reported was due to mima generator not picking up the new jars in presence of old jars(theoretically this should not have happened.). So as a workaround, ran them both separately and just append them together.
Author: Prashant Sharma <prashant@apache.org>
Author: Prashant Sharma <prashant.s@imaginea.com>
Closes #2285 from ScrapCodes/mima-fix and squashes the following commits:
093c76f [Prashant Sharma] Update mima
59012a8 [Prashant Sharma] Update mima
35b6c71 [Prashant Sharma] SPARK-3433 Fix for Mima false-positives with @DeveloperAPI and @Experimental annotations.
Diffstat (limited to 'project')
| -rw-r--r-- | project/MimaBuild.scala | 6 | ||||
| -rw-r--r-- | project/MimaExcludes.scala | 8 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index 0f5d71afcf..39f8ba4745 100644 --- a/project/MimaBuild.scala +++ b/project/MimaBuild.scala @@ -30,6 +30,12 @@ object MimaBuild { def excludeMember(fullName: String) = Seq( ProblemFilters.exclude[MissingMethodProblem](fullName), + // Sometimes excluded methods have default arguments and + // they are translated into public methods/fields($default$) in generated + // bytecode. It is not possible to exhustively list everything. + // But this should be okay. + ProblemFilters.exclude[MissingMethodProblem](fullName+"$default$2"), + ProblemFilters.exclude[MissingMethodProblem](fullName+"$default$1"), ProblemFilters.exclude[MissingFieldProblem](fullName), ProblemFilters.exclude[IncompatibleResultTypeProblem](fullName), ProblemFilters.exclude[IncompatibleMethTypeProblem](fullName), diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 46b78bd5c7..2f1e05dfcc 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -37,14 +37,8 @@ object MimaExcludes { Seq( MimaBuild.excludeSparkPackage("deploy"), 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"), diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c07ea313f1..ab9f8ba120 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -187,7 +187,7 @@ object OldDeps { Some("org.apache.spark" % fullId % "1.1.0") } - def oldDepsSettings() = Defaults.defaultSettings ++ Seq( + def oldDepsSettings() = Defaults.coreDefaultSettings ++ Seq( name := "old-deps", scalaVersion := "2.10.4", retrieveManaged := true, |