aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorGuoQiang Li <witgo@qq.com>2014-08-01 23:55:11 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-08-01 23:55:11 -0700
commitadc8303294e26efb4ed15e5f5ba1062f7988625d (patch)
tree09d3231b718713f384e51711b31d737c5edcf6c7 /project
parent4bc3bb29a4b6ab24b6b7e1f8df26414c41c80ace (diff)
downloadspark-adc8303294e26efb4ed15e5f5ba1062f7988625d.tar.gz
spark-adc8303294e26efb4ed15e5f5ba1062f7988625d.tar.bz2
spark-adc8303294e26efb4ed15e5f5ba1062f7988625d.zip
[SPARK-1470][SPARK-1842] Use the scala-logging wrapper instead of the directly sfl4j api
Author: GuoQiang Li <witgo@qq.com> Closes #1369 from witgo/SPARK-1470_new and squashes the following commits: 66a1641 [GuoQiang Li] IncompatibleResultTypeProblem 73a89ba [GuoQiang Li] Use the scala-logging wrapper instead of the directly sfl4j api.
Diffstat (limited to 'project')
-rw-r--r--project/MimaExcludes.scala91
1 files changed, 89 insertions, 2 deletions
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 537ca0dcf2..a0cee1d765 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -103,14 +103,101 @@ object MimaExcludes {
ProblemFilters.exclude[IncompatibleMethTypeProblem](
"org.apache.spark.mllib.tree.impurity.Variance.calculate")
) ++
- Seq ( // Package-private classes removed in SPARK-2341
+ Seq( // Package-private classes removed in SPARK-2341
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.mllib.util.BinaryLabelParser"),
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.mllib.util.BinaryLabelParser$"),
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.mllib.util.LabelParser"),
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.mllib.util.LabelParser$"),
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.mllib.util.MulticlassLabelParser"),
ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.mllib.util.MulticlassLabelParser$")
- )
+ ) ++
+ Seq(
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.bagel.Bagel.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.StreamingContext.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.dstream.DStream.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.mllib.recommendation.ALS.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.mllib.clustering.KMeans.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.mllib.classification.NaiveBayes.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.kafka.KafkaReceiver.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.SparkContext.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.rdd.PairRDDFunctions.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.rdd.OrderedRDDFunctions.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.rdd.SequenceFileRDDFunctions.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.rdd.DoubleRDDFunctions.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.twitter.TwitterReceiver.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.zeromq.ZeroMQReceiver.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.flume.FlumeReceiver.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.rdd.RDD.log"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.SparkConf.log"),
+
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.SparkConf.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.bagel.Bagel.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.StreamingContext.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.dstream.DStream.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.mllib.recommendation.ALS.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.mllib.clustering.KMeans.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.mllib.classification.NaiveBayes.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.twitter.TwitterReceiver.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.zeromq.ZeroMQReceiver.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.SparkContext.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.rdd.RDD.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.rdd.SequenceFileRDDFunctions.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.rdd.OrderedRDDFunctions.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.rdd.PairRDDFunctions.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.kafka.KafkaReceiver.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.rdd.DoubleRDDFunctions.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.flume.FlumeReceiver.org$apache$spark$Logging$$log__="),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.kafka.KafkaReceiver.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem]
+ ("org.apache.spark.streaming.twitter.TwitterReceiver.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.twitter.TwitterReceiver.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.zeromq.ZeroMQReceiver.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.bagel.Bagel.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.bagel.Bagel.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.flume.FlumeReceiver.org$apache$spark$Logging$$log_"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem]
+ ("org.apache.spark.streaming.kafka.KafkaReceiver.org$apache$spark$Logging$$log_")
+ )
case v if v.startsWith("1.0") =>
Seq(
MimaBuild.excludeSparkPackage("api.java"),