diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-06-03 10:11:27 -0700 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-06-03 10:11:27 -0700 |
| commit | 2c4d550eda0e6f33d2d575825c3faef4c9217067 (patch) | |
| tree | 772e823c28ba30b0765020e6e11b07133e211d31 /project | |
| parent | f1646e1023bd03e27268a8aa2ea11b6cc284075f (diff) | |
| download | spark-2c4d550eda0e6f33d2d575825c3faef4c9217067.tar.gz spark-2c4d550eda0e6f33d2d575825c3faef4c9217067.tar.bz2 spark-2c4d550eda0e6f33d2d575825c3faef4c9217067.zip | |
[SPARK-7801] [BUILD] Updating versions to SPARK 1.5.0
Author: Patrick Wendell <patrick@databricks.com>
Closes #6328 from pwendell/spark-1.5-update and squashes the following commits:
2f42d02 [Patrick Wendell] A few more excludes
4bebcf0 [Patrick Wendell] Update to RC4
61aaf46 [Patrick Wendell] Using new release candidate
55f1610 [Patrick Wendell] Another exclude
04b4f04 [Patrick Wendell] More issues with transient 1.4 changes
36f549b [Patrick Wendell] [SPARK-7801] [BUILD] Updating versions to SPARK 1.5.0
Diffstat (limited to 'project')
| -rw-r--r-- | project/MimaBuild.scala | 3 | ||||
| -rw-r--r-- | project/MimaExcludes.scala | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index dde92949fa..5812b72f0a 100644 --- a/project/MimaBuild.scala +++ b/project/MimaBuild.scala @@ -91,7 +91,8 @@ object MimaBuild { def mimaSettings(sparkHome: File, projectRef: ProjectRef) = { val organization = "org.apache.spark" - val previousSparkVersion = "1.3.0" + // TODO: Change this once Spark 1.4.0 is released + val previousSparkVersion = "1.4.0-rc4" val fullId = "spark-" + projectRef.project + "_2.10" mimaDefaultSettings ++ Seq(previousArtifact := Some(organization % fullId % previousSparkVersion), diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 8da72b3fa7..34371c9659 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -34,6 +34,20 @@ import com.typesafe.tools.mima.core.ProblemFilters._ object MimaExcludes { def excludes(version: String) = version match { + case v if v.startsWith("1.5") => + Seq( + MimaBuild.excludeSparkPackage("deploy"), + // These are needed if checking against the sbt build, since they are part of + // the maven-generated artifacts in 1.3. + excludePackage("org.spark-project.jetty"), + MimaBuild.excludeSparkPackage("unused"), + // JavaRDDLike is not meant to be extended by user programs + ProblemFilters.exclude[MissingMethodProblem]( + "org.apache.spark.api.java.JavaRDDLike.partitioner"), + // Mima false positive (was a private[spark] class) + ProblemFilters.exclude[MissingClassProblem]( + "org.apache.spark.util.collection.PairIterator") + ) case v if v.startsWith("1.4") => Seq( MimaBuild.excludeSparkPackage("deploy"), |