diff --git a/pom.xml b/pom.xml index 1efa9045208fd37881f07c34715c346a999d0f32..d05190512f7424f3af73bcbf0e4820c71131ade0 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index 034ba6a7bf50f37e30750aa54295ac4d6be9f7be..0f5d71afcf616373b839391e404536ea467ac734 100644 --- a/project/MimaBuild.scala +++ b/project/MimaBuild.scala @@ -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), diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 855d5cc8cf3fd046709ca3cf5778ff475987da23..46b78bd5c70615018c199e33242da281710033af 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -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"), + 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"),