From c4d4f4e27f9f9e32b058467fd6c37b6f5ccae51c Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Wed, 19 Nov 2014 11:56:25 -0800 Subject: [PATCH 1/2] MIMA hot fix --- project/MimaExcludes.scala | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 6ab2d1b04cc8..d4519f9c9ac4 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -99,6 +99,12 @@ object MimaExcludes { // SPARK-4062 ProblemFilters.exclude[MissingMethodProblem]( "org.apache.spark.streaming.kafka.KafkaReceiver#MessageHandler.this") + ) ++ Seq( + // SPARK-2321 + ProblemFilters.exclude[MissingMethodProblem]( + "org.apache.spark.SparkStageInfoImpl.this"), + ProblemFilters.exclude[MissingMethodProblem]( + "org.apache.spark.SparkStageInfo.submissionTime") ) case v if v.startsWith("1.1") => From 842d0590de0455718e00b2a80c94a71b666f9a99 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Wed, 19 Nov 2014 13:49:28 -0800 Subject: [PATCH 2/2] Move excludes to the right section --- project/MimaExcludes.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index d4519f9c9ac4..94de14ddbd2b 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -41,6 +41,12 @@ object MimaExcludes { // the maven-generated artifacts in the 1.2 build. MimaBuild.excludeSparkPackage("unused"), ProblemFilters.exclude[MissingClassProblem]("com.google.common.base.Optional") + ) ++ Seq( + // SPARK-2321 + ProblemFilters.exclude[MissingMethodProblem]( + "org.apache.spark.SparkStageInfoImpl.this"), + ProblemFilters.exclude[MissingMethodProblem]( + "org.apache.spark.SparkStageInfo.submissionTime") ) case v if v.startsWith("1.2") => @@ -99,12 +105,6 @@ object MimaExcludes { // SPARK-4062 ProblemFilters.exclude[MissingMethodProblem]( "org.apache.spark.streaming.kafka.KafkaReceiver#MessageHandler.this") - ) ++ Seq( - // SPARK-2321 - ProblemFilters.exclude[MissingMethodProblem]( - "org.apache.spark.SparkStageInfoImpl.this"), - ProblemFilters.exclude[MissingMethodProblem]( - "org.apache.spark.SparkStageInfo.submissionTime") ) case v if v.startsWith("1.1") =>