aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorYin Huai <yhuai@databricks.com>2016-04-28 19:57:41 -0700
committerYin Huai <yhuai@databricks.com>2016-04-28 19:57:41 -0700
commit9c7c42bc6a35679cfffcdfb6feb26af834fec2e1 (patch)
treeaa6d78de55cc9107f26e0eee8ddaaf84da5436f2 /project
parent2398e3d69c9a675d651c192107953de8e6c2aecd (diff)
downloadspark-9c7c42bc6a35679cfffcdfb6feb26af834fec2e1.tar.gz
spark-9c7c42bc6a35679cfffcdfb6feb26af834fec2e1.tar.bz2
spark-9c7c42bc6a35679cfffcdfb6feb26af834fec2e1.zip
Revert "[SPARK-14613][ML] Add @Since into the matrix and vector classes in spark-mllib-local"
This reverts commit dae538a4d7c36191c1feb02ba87ffc624ab960dc.
Diffstat (limited to 'project')
-rw-r--r--project/MimaExcludes.scala4
-rw-r--r--project/SparkBuild.scala10
2 files changed, 5 insertions, 9 deletions
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 26a3760bc3..6fc49a08fe 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -700,10 +700,6 @@ object MimaExcludes {
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.executor.ShuffleReadMetrics.localBlocksFetched"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.status.api.v1.ShuffleReadMetrics.remoteBlocksFetched"),
ProblemFilters.exclude[IncompatibleResultTypeProblem]("org.apache.spark.status.api.v1.ShuffleReadMetrics.localBlocksFetched")
- ) ++ Seq(
- // [SPARK-14613] Add @Since into the matrix and vector classes in spark-mllib-local
- ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.annotation.package$"),
- ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.annotation.package")
)
case v if v.startsWith("1.6") =>
Seq(
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index ecd08defd2..ffbca25e46 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -50,10 +50,10 @@ object BuildCommons {
).map(ProjectRef(buildLocation, _))
val allProjects@Seq(
- core, graphx, mllib, mllibLocal, repl, networkCommon, networkShuffle, launcher, unsafe, tags, sketch, _*
+ core, graphx, mllib, mllibLocal, repl, networkCommon, networkShuffle, launcher, unsafe, testTags, sketch, _*
) = Seq(
"core", "graphx", "mllib", "mllib-local", "repl", "network-common", "network-shuffle", "launcher", "unsafe",
- "tags", "sketch"
+ "test-tags", "sketch"
).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects
val optionallyEnabledProjects@Seq(yarn, java8Tests, sparkGangliaLgpl,
@@ -336,7 +336,7 @@ object SparkBuild extends PomBuild {
val mimaProjects = allProjects.filterNot { x =>
Seq(
spark, hive, hiveThriftServer, hiveCompatibility, catalyst, repl, networkCommon, networkShuffle, networkYarn,
- unsafe, tags, sketch, mllibLocal
+ unsafe, testTags, sketch, mllibLocal
).contains(x)
}
@@ -680,9 +680,9 @@ object Unidoc {
publish := {},
unidocProjectFilter in(ScalaUnidoc, unidoc) :=
- inAnyProject -- inProjects(OldDeps.project, repl, examples, tools, streamingFlumeSink, yarn, tags),
+ inAnyProject -- inProjects(OldDeps.project, repl, examples, tools, streamingFlumeSink, yarn, testTags),
unidocProjectFilter in(JavaUnidoc, unidoc) :=
- inAnyProject -- inProjects(OldDeps.project, repl, examples, tools, streamingFlumeSink, yarn, tags),
+ inAnyProject -- inProjects(OldDeps.project, repl, examples, tools, streamingFlumeSink, yarn, testTags),
// Skip actual catalyst, but include the subproject.
// Catalyst is not public API and contains quasiquotes which break scaladoc.