[SPARK-25592] Setting version to 3.0.0-SNAPSHOT

## What changes were proposed in this pull request? This patch is to bump the master branch version to 3.0.0-SNAPSHOT. ## How was this patch tested? N/A Closes #22606 from gatorsmile/bump3.0. Authored-by: gatorsmile <gatorsmile@gmail.com> Signed-off-by: gatorsmile <gatorsmile@gmail.com>
2018-10-02 08:48:24 -07:00 · 2018-10-02 08:48:24 -07:00 · 9bf397c0e4
parent 71876633f3
commit 9bf397c0e4
50 changed files with 54 additions and 54 deletions
--- a/R/pkg/DESCRIPTION
+++ b/R/pkg/DESCRIPTION
@ -1,6 +1,6 @@
 Package: SparkR
 Type: Package
-Version: 2.5.0
+Version: 3.0.0
 Title: R Frontend for Apache Spark
 Description: Provides an R Frontend for Apache Spark.
 Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"),
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/common/kvstore/pom.xml
+++ b/common/kvstore/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/common/network-common/pom.xml
+++ b/common/network-common/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/common/network-shuffle/pom.xml
+++ b/common/network-shuffle/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/common/sketch/pom.xml
+++ b/common/sketch/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/common/tags/pom.xml
+++ b/common/tags/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/common/unsafe/pom.xml
+++ b/common/unsafe/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/core/pom.xml
+++ b/core/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- 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: 2.5.0-SNAPSHOT
-SPARK_VERSION_SHORT: 2.5.0
+SPARK_VERSION: 3.0.0-SNAPSHOT
+SPARK_VERSION_SHORT: 3.0.0
 SCALA_BINARY_VERSION: "2.11"
 SCALA_VERSION: "2.11.12"
 MESOS_VERSION: 1.0.0
--- a/examples/pom.xml
+++ b/examples/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/external/avro/pom.xml
+++ b/external/avro/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/docker-integration-tests/pom.xml
+++ b/external/docker-integration-tests/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- 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.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- 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.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/flume/pom.xml
+++ b/external/flume/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kafka-0-10-assembly/pom.xml
+++ b/external/kafka-0-10-assembly/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kafka-0-10-sql/pom.xml
+++ b/external/kafka-0-10-sql/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kafka-0-10/pom.xml
+++ b/external/kafka-0-10/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kafka-0-8-assembly/pom.xml
+++ b/external/kafka-0-8-assembly/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kafka-0-8/pom.xml
+++ b/external/kafka-0-8/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kinesis-asl-assembly/pom.xml
+++ b/external/kinesis-asl-assembly/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/kinesis-asl/pom.xml
+++ b/external/kinesis-asl/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/external/spark-ganglia-lgpl/pom.xml
+++ b/external/spark-ganglia-lgpl/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/hadoop-cloud/pom.xml
+++ b/hadoop-cloud/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/mllib-local/pom.xml
+++ b/mllib-local/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/pom.xml
+++ b/pom.xml
@ -26,7 +26,7 @@
  </parent>
  <groupId>org.apache.spark</groupId>
  <artifactId>spark-parent_2.11</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>Spark Project Parent POM</name>
  <url>http://spark.apache.org/</url>
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@ -34,8 +34,8 @@ import com.typesafe.tools.mima.core.ProblemFilters._
 */
 object MimaExcludes {

-  // Exclude rules for 2.5.x
-  lazy val v25excludes = v24excludes ++ Seq(
+  // Exclude rules for 3.0.x
+  lazy val v30excludes = v24excludes ++ Seq(
  )

  // Exclude rules for 2.4.x
@ -1206,7 +1206,7 @@ object MimaExcludes {
  }

  def excludes(version: String) = version match {
-    case v if v.startsWith("2.5") => v25excludes
+    case v if v.startsWith("3.0") => v30excludes
    case v if v.startsWith("2.4") => v24excludes
    case v if v.startsWith("2.3") => v23excludes
    case v if v.startsWith("2.2") => v22excludes
--- a/python/pyspark/sql/dataframe.py
+++ b/python/pyspark/sql/dataframe.py
@ -883,7 +883,7 @@ class DataFrame(object):
        >>> dataset.sampleBy(col("key"), fractions={2: 1.0}, seed=0).count()
        33

-        .. versionchanged:: 2.5
+        .. versionchanged:: 3.0
           Added sampling by a column of :class:`Column`
        """
        if isinstance(col, basestring):
--- a/python/pyspark/sql/functions.py
+++ b/python/pyspark/sql/functions.py
@ -2355,7 +2355,7 @@ def schema_of_json(col, options={}):
    :param col: string column in json format
    :param options: options to control parsing. accepts the same options as the JSON datasource

-    .. versionchanged:: 2.5
+    .. versionchanged:: 3.0
       It accepts `options` parameter to control schema inferring.

    >>> from pyspark.sql.types import *
--- a/python/pyspark/version.py
+++ b/python/pyspark/version.py
@ -16,4 +16,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-__version__ = "2.5.0.dev0"
+__version__ = "3.0.0.dev0"
--- a/repl/pom.xml
+++ b/repl/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/resource-managers/kubernetes/core/pom.xml
+++ b/resource-managers/kubernetes/core/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>

--- a/resource-managers/kubernetes/integration-tests/pom.xml
+++ b/resource-managers/kubernetes/integration-tests/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../../pom.xml</relativePath>
  </parent>

--- a/resource-managers/mesos/pom.xml
+++ b/resource-managers/mesos/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/resource-managers/yarn/pom.xml
+++ b/resource-managers/yarn/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/sql/catalyst/pom.xml
+++ b/sql/catalyst/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala
@ -323,7 +323,7 @@ case class Divide(left: Expression, right: Expression) extends DivModLike {
      > SELECT 3 _FUNC_ 2;
       1
  """,
-  since = "2.5.0")
+  since = "3.0.0")
 // scalastyle:on line.size.limit
 case class IntegralDivide(left: Expression, right: Expression) extends DivModLike {

--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala
@ -414,7 +414,7 @@ final class DataFrameStatFunctions private[sql](df: DataFrame) {
   *    +-----+---+
   * }}}
   *
-   * @since 2.5.0
+   * @since 3.0.0
   */
  def sampleBy[T](col: Column, fractions: Map[T, Double], seed: Long): DataFrame = {
    require(fractions.values.forall(p => p >= 0.0 && p <= 1.0),
@ -437,7 +437,7 @@ final class DataFrameStatFunctions private[sql](df: DataFrame) {
   * @tparam T stratum type
   * @return a new `DataFrame` that represents the stratified sample
   *
-   * @since 2.5.0
+   * @since 3.0.0
   */
  def sampleBy[T](col: Column, fractions: ju.Map[T, jl.Double], seed: Long): DataFrame = {
    sampleBy(col, fractions.asScala.toMap.asInstanceOf[Map[T, Double]], seed)
--- a/sql/core/src/main/scala/org/apache/spark/sql/RelationalGroupedDataset.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/RelationalGroupedDataset.scala
@ -330,7 +330,7 @@ class RelationalGroupedDataset protected[sql](
   *   df.groupBy("year").pivot("course").sum("earnings")
   * }}}
   *
-   * From Spark 2.5.0, values can be literal columns, for instance, struct. For pivoting by
+   * From Spark 3.0.0, values can be literal columns, for instance, struct. For pivoting by
   * multiple columns, use the `struct` function to combine the columns and values:
   *
   * {{{
--- a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
@ -3620,7 +3620,7 @@ object functions {
   * @return a column with string literal containing schema in DDL format.
   *
   * @group collection_funcs
-   * @since 2.5.0
+   * @since 3.0.0
   */
  def schema_of_json(e: Column, options: java.util.Map[String, String]): Column = {
    withExpr(SchemaOfJson(e.expr, options.asScala.toMap))
--- 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.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@ -22,7 +22,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@ -21,7 +21,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>

--- a/tools/pom.xml
+++ b/tools/pom.xml
@ -20,7 +20,7 @@
  <parent>
    <groupId>org.apache.spark</groupId>
    <artifactId>spark-parent_2.11</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>