diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
index 369714f7b99c2f7ae6939fe9ddae1708f38378e0..465bc37788e5da619e939b47caad8a8793b98d9c 100644
--- a/R/pkg/DESCRIPTION
+++ b/R/pkg/DESCRIPTION
@@ -1,7 +1,7 @@
Package: SparkR
Type: Package
Title: R frontend for Spark
-Version: 1.6.0
+Version: 2.0.0
Date: 2013-09-09
Author: The Apache Software Foundation
Maintainer: Shivaram Venkataraman <shivaram@cs.berkeley.edu>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 4b60ee00ffbe55217f163cceb7e69dfb6fd6d194..c3ab92f993d079e1b045569439f1e6248eb550d6 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/bagel/pom.xml b/bagel/pom.xml
index 672e9469aec92f94f6956978dd4afc07a107a747..d45224cc8078d52b2247f1b9bb22c12f3598713a 100644
--- a/bagel/pom.xml
+++ b/bagel/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index 61744bb5c7bf59167a26cf69db0387b1d9d4b02a..34ecb19654f1ad789da4fcfba855076ef38a8d1c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala
index 7515aad09db730856f6e6444ee8536bad95a6cd1..cc5e7ef3ae0085ccc354a5e1198df516ef6e69ad 100644
--- a/core/src/main/scala/org/apache/spark/package.scala
+++ b/core/src/main/scala/org/apache/spark/package.scala
@@ -43,5 +43,5 @@ package org.apache
package object spark {
// For package docs only
- val SPARK_VERSION = "1.6.0-SNAPSHOT"
+ val SPARK_VERSION = "2.0.0-SNAPSHOT"
}
diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index 39d3f344615e16d2c27af7ec3485927e672b1daa..78b638ecfa638fdd13a075f65ca9beb138462a6b 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/docs/_config.yml b/docs/_config.yml
index 2c70b76be8b7a35aba788efc907ecf8ae1b4d269..dc25ff2c16c5ef770d2d06c020fef711a90418dd 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -14,8 +14,8 @@ include:
# These allow the documentation to be updated with newer releases
# of Spark, Scala, and Mesos.
-SPARK_VERSION: 1.6.0-SNAPSHOT
-SPARK_VERSION_SHORT: 1.6.0
+SPARK_VERSION: 2.0.0-SNAPSHOT
+SPARK_VERSION_SHORT: 2.0.0
SCALA_BINARY_VERSION: "2.10"
SCALA_VERSION: "2.10.5"
MESOS_VERSION: 0.21.0
diff --git a/examples/pom.xml b/examples/pom.xml
index f5ab2a7fdc098ed33d864d74fa8a269c198fde88..d27a5096a6511d7f84daebfd09c36bdb2033cfdb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml
index dceedcf23ed5bfbfea52aa782b2ecfca844c531f..b2c377fe4cc9baa183e59c98a8c6b31e7e0a8095 100644
--- a/external/flume-assembly/pom.xml
+++ b/external/flume-assembly/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml
index 75113ff753e7a22108040ed59452e0e577b00799..4b6485ee0a71a9b7feeedeedb57bd06fae780d77 100644
--- a/external/flume-sink/pom.xml
+++ b/external/flume-sink/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/flume/pom.xml b/external/flume/pom.xml
index 57f83607365d6307440640db740765812d098a5d..a79656c6f7d9606b225a2142d458232afcd7f972 100644
--- a/external/flume/pom.xml
+++ b/external/flume/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/kafka-assembly/pom.xml b/external/kafka-assembly/pom.xml
index a9ed39ef8c9a03150b98a62cee0497367041c6d7..0c466b3c4ac372b72052dba66aa2efaca68b014c 100644
--- a/external/kafka-assembly/pom.xml
+++ b/external/kafka-assembly/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/kafka/pom.xml b/external/kafka/pom.xml
index 79258c126e043dc6bb7e937925d56bf68e6124bf..5180ab6dbafbdfe0113cad455cc503b1bebc8107 100644
--- a/external/kafka/pom.xml
+++ b/external/kafka/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/mqtt-assembly/pom.xml b/external/mqtt-assembly/pom.xml
index 89713a28ca6a8c95582ff6cfc39b7ca79640d0fb..c4a1ae26ea6995b573254073a207c7cf8eb9b847 100644
--- a/external/mqtt-assembly/pom.xml
+++ b/external/mqtt-assembly/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/mqtt/pom.xml b/external/mqtt/pom.xml
index 59fba8b826b4f3f3b7de8899b1f97757d9f6e927..b3ba72a0087adaa28eecbff8c7cbe41e008464ef 100644
--- a/external/mqtt/pom.xml
+++ b/external/mqtt/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/twitter/pom.xml b/external/twitter/pom.xml
index 087270de90b3f96bf891bbc841df692cab59749a..7b628b09ea6a5a75f9afd2c7ca6ff4d2cd2e27c1 100644
--- a/external/twitter/pom.xml
+++ b/external/twitter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/external/zeromq/pom.xml b/external/zeromq/pom.xml
index 02d6b812815765605700f39405dfdb991bd253b7..a72598844907591fafbff2af2b994067b793c2bc 100644
--- a/external/zeromq/pom.xml
+++ b/external/zeromq/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/extras/java8-tests/pom.xml b/extras/java8-tests/pom.xml
index 4ce90e75fd359948beb23c652e841d607bfd23c8..4dfe3b654df1a4973cfa0aeceedead2934a3c1c4 100644
--- a/extras/java8-tests/pom.xml
+++ b/extras/java8-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/extras/kinesis-asl-assembly/pom.xml b/extras/kinesis-asl-assembly/pom.xml
index 61ba4787fbf90f23ee20abe73a3c9dbc0bfcaac4..601080c2e6fbdae804c5dbec749345bc538e24e5 100644
--- a/extras/kinesis-asl-assembly/pom.xml
+++ b/extras/kinesis-asl-assembly/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/extras/kinesis-asl/pom.xml b/extras/kinesis-asl/pom.xml
index 519a920279c9776866ff5bb994f1fc7a0d4870b8..3c5722502e5c14b644f67c1835c70d75ee952b72 100644
--- a/extras/kinesis-asl/pom.xml
+++ b/extras/kinesis-asl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/extras/spark-ganglia-lgpl/pom.xml b/extras/spark-ganglia-lgpl/pom.xml
index 87a4f05a059618e3437cdd1578a5f7c54e267997..b046a10a04d5b820baa828bea9f1f01345ca425a 100644
--- a/extras/spark-ganglia-lgpl/pom.xml
+++ b/extras/spark-ganglia-lgpl/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 8cd66c5b2e82624b66a8652a91f21f80212f657c..388a0ef06a2b00a9a821a990cfb23fb5937e037f 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 5739bfc16958f601c5fafc197fca423c85d5905f..135866cea2e7494ef7a13d2b59772b7f9fbc368c 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/mllib/pom.xml b/mllib/pom.xml
index df50aca1a3f767b0da7f5fa262f5f1e4c0e80704..42af2b8b3e411da6fcfb342758ef8728237104ee 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/network/common/pom.xml b/network/common/pom.xml
index 9af6cc5e925f9d97c2c14d1ee163fa8d79049a6e..32c34c63a45c556bf9eda9aeefe84cfba1a2ef91 100644
--- a/network/common/pom.xml
+++ b/network/common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/network/shuffle/pom.xml b/network/shuffle/pom.xml
index 70ba5cb1995bb2eb25586e11edfedffe0dddb283..f9aa7e2dd1f43242d5b2c133b464fecfb7f0208d 100644
--- a/network/shuffle/pom.xml
+++ b/network/shuffle/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml
index e2360eff5cfe11ec04c9d9ce092d305b722c9441..a19cbb04b18c667f5e1b14044cec3697005b55d6 100644
--- a/network/yarn/pom.xml
+++ b/network/yarn/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index c560e13641c6e2e032c563237c8795e1e5a5bafa..1f570727dc4ccf8d01bd6e2695e1cace80bdd4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spark Project Parent POM</name>
<url>http://spark.apache.org/</url>
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index edae59d882668d2c1630115c7357cd0ac1c692eb..a3cfcd20fe690cd8bcadbe697c524738c9946906 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -33,6 +33,142 @@ import com.typesafe.tools.mima.core.ProblemFilters._
*/
object MimaExcludes {
def excludes(version: String) = version match {
+ case v if v.startsWith("2.0") =>
+ // When 1.6 is officially released, update this exclusion list.
+ Seq(
+ MimaBuild.excludeSparkPackage("deploy"),
+ MimaBuild.excludeSparkPackage("network"),
+ MimaBuild.excludeSparkPackage("unsafe"),
+ // 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"),
+ // SQL execution is considered private.
+ excludePackage("org.apache.spark.sql.execution"),
+ // SQL columnar is considered private.
+ excludePackage("org.apache.spark.sql.columnar"),
+ // The shuffle package is considered private.
+ excludePackage("org.apache.spark.shuffle"),
+ // The collections utlities are considered pricate.
+ excludePackage("org.apache.spark.util.collection")
+ ) ++
+ MimaBuild.excludeSparkClass("streaming.flume.FlumeTestUtils") ++
+ MimaBuild.excludeSparkClass("streaming.flume.PollingFlumeTestUtils") ++
+ Seq(
+ // MiMa does not deal properly with sealed traits
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.ml.classification.LogisticRegressionSummary.featuresCol")
+ ) ++ Seq(
+ // SPARK-11530
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.mllib.feature.PCAModel.this")
+ ) ++ Seq(
+ // SPARK-10381 Fix types / units in private AskPermissionToCommitOutput RPC message.
+ // This class is marked as `private` but MiMa still seems to be confused by the change.
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.task"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.copy$default$2"),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.copy"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.taskAttempt"),
+ ProblemFilters.exclude[IncompatibleResultTypeProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.copy$default$3"),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.this"),
+ ProblemFilters.exclude[IncompatibleMethTypeProblem](
+ "org.apache.spark.scheduler.AskPermissionToCommitOutput.apply")
+ ) ++ Seq(
+ ProblemFilters.exclude[MissingClassProblem](
+ "org.apache.spark.shuffle.FileShuffleBlockResolver$ShuffleFileGroup")
+ ) ++ Seq(
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.ml.regression.LeastSquaresAggregator.add"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.ml.regression.LeastSquaresCostFun.this"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.clearLastInstantiatedContext"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.setLastInstantiatedContext"),
+ ProblemFilters.exclude[MissingClassProblem](
+ "org.apache.spark.sql.SQLContext$SQLSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.detachSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.tlSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.defaultSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.currentSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.openSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.setSession"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.sql.SQLContext.createSession")
+ ) ++ Seq(
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.SparkContext.preferredNodeLocationData_="),
+ ProblemFilters.exclude[MissingClassProblem](
+ "org.apache.spark.rdd.MapPartitionsWithPreparationRDD"),
+ ProblemFilters.exclude[MissingClassProblem](
+ "org.apache.spark.rdd.MapPartitionsWithPreparationRDD$"),
+ ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.sql.SparkSQLParser")
+ ) ++ Seq(
+ // SPARK-11485
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.DataFrameHolder.df"),
+ // SPARK-11541 mark various JDBC dialects as private
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.productElement"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.productArity"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.canEqual"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.productIterator"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.productPrefix"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.toString"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.NoopDialect.hashCode"),
+ ProblemFilters.exclude[MissingTypesProblem]("org.apache.spark.sql.jdbc.PostgresDialect$"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.productElement"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.productArity"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.canEqual"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.productIterator"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.productPrefix"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.toString"),
+ ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.sql.jdbc.PostgresDialect.hashCode"),
+ ProblemFilters.exclude[MissingTypesProblem]("org.apache.spark.sql.jdbc.NoopDialect$")
+ ) ++ Seq (
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.status.api.v1.ApplicationInfo.this"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.status.api.v1.StageData.this")
+ ) ++ Seq(
+ // SPARK-11766 add toJson to Vector
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.mllib.linalg.Vector.toJson")
+ ) ++ Seq(
+ // SPARK-9065 Support message handler in Kafka Python API
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.streaming.kafka.KafkaUtilsPythonHelper.createDirectStream"),
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.streaming.kafka.KafkaUtilsPythonHelper.createRDD")
+ ) ++ Seq(
+ // SPARK-4557 Changed foreachRDD to use VoidFunction
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.streaming.api.java.JavaDStreamLike.foreachRDD")
+ ) ++ Seq(
+ // SPARK-11996 Make the executor thread dump work again
+ ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.executor.ExecutorEndpoint"),
+ ProblemFilters.exclude[MissingClassProblem]("org.apache.spark.executor.ExecutorEndpoint$"),
+ ProblemFilters.exclude[MissingClassProblem](
+ "org.apache.spark.storage.BlockManagerMessages$GetRpcHostPortForExecutor"),
+ ProblemFilters.exclude[MissingClassProblem](
+ "org.apache.spark.storage.BlockManagerMessages$GetRpcHostPortForExecutor$")
+ ) ++ Seq(
+ // SPARK-3580 Add getNumPartitions method to JavaRDD
+ ProblemFilters.exclude[MissingMethodProblem](
+ "org.apache.spark.api.java.JavaRDDLike.getNumPartitions")
+ ) ++
+ // SPARK-11314: YARN backend moved to yarn sub-module and MiMA complains even though it's a
+ // private class.
+ MimaBuild.excludeSparkClass("scheduler.cluster.YarnSchedulerBackend$YarnSchedulerEndpoint")
case v if v.startsWith("1.6") =>
Seq(
MimaBuild.excludeSparkPackage("deploy"),
diff --git a/repl/pom.xml b/repl/pom.xml
index 154c99d23c7f4c0342933b7370834bbab01dbadb..67f9866509337b98a0b99ed3a4f91b781c781fe1 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml
index 61d6fc63554bbf9f0ba81dba8207d600452778d3..cfa520b7b9db2ceb7bb99292729fe150076f46dc 100644
--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 06841b0945624ca9fff486bb23ad1e2210feaa08..6db7a8a2dc5269bededa3b597efb5c4ad72fc5e3 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml
index b5b2143292a694a72b698439fadd9486113d48a2..435e565f634583c9af1c8c71fb3b9a4bae63cfe0 100644
--- a/sql/hive-thriftserver/pom.xml
+++ b/sql/hive-thriftserver/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index d96f3e2b9f62bd25084321af8e0f58a8273bf089..e9885f6682028fc95f77dbb7d72cfd4b7722f5ae 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 435e16db13ab4a16fd4045abe1f7f11de3e2d8c8..39cbd0d00f951134377ada02a1c6f563d2e745ee 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tags/README.md b/tags/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..01e5126945eb788a6109579f34f2b8e3ff2fc4d6
--- /dev/null
+++ b/tags/README.md
@@ -0,0 +1 @@
+This module includes annotations in Java that are used to annotate test suites.
diff --git a/tags/pom.xml b/tags/pom.xml
index ca93722e73345c20f98d2e107c5740f31e3db25a..9e4610dae7a65f9b843b500c025c0df1db8e6be9 100644
--- a/tags/pom.xml
+++ b/tags/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/tools/pom.xml b/tools/pom.xml
index 1e64f280e5bedb104d57c8309c4f3fc8845b4f8c..30cbb6a5a59c76f1bcb930ebc176de060b7497fc 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/unsafe/pom.xml b/unsafe/pom.xml
index a1c1111364ee855f956818d307af1302d715c043..21fef3415adce8fd73ea202481aa7cd4c7ca1edf 100644
--- a/unsafe/pom.xml
+++ b/unsafe/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 989b820bec9ef4dbce1151c0911aab9f3416d0d8..a8c122fd40a1f950ee2125e26a9be1cfb85eccb9 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.10</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>