Repository: spark Updated Branches: refs/heads/master 71876633f -> 9bf397c0e
[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 <[email protected]> Signed-off-by: gatorsmile <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9bf397c0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9bf397c0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9bf397c0 Branch: refs/heads/master Commit: 9bf397c0e45cb161f3f12f09bd2bf14ff96dc823 Parents: 7187663 Author: gatorsmile <[email protected]> Authored: Tue Oct 2 08:48:24 2018 -0700 Committer: gatorsmile <[email protected]> Committed: Tue Oct 2 08:48:24 2018 -0700 ---------------------------------------------------------------------- R/pkg/DESCRIPTION | 2 +- assembly/pom.xml | 2 +- common/kvstore/pom.xml | 2 +- common/network-common/pom.xml | 2 +- common/network-shuffle/pom.xml | 2 +- common/network-yarn/pom.xml | 2 +- common/sketch/pom.xml | 2 +- common/tags/pom.xml | 2 +- common/unsafe/pom.xml | 2 +- core/pom.xml | 2 +- docs/_config.yml | 4 ++-- examples/pom.xml | 2 +- external/avro/pom.xml | 2 +- external/docker-integration-tests/pom.xml | 2 +- external/flume-assembly/pom.xml | 2 +- external/flume-sink/pom.xml | 2 +- external/flume/pom.xml | 2 +- external/kafka-0-10-assembly/pom.xml | 2 +- external/kafka-0-10-sql/pom.xml | 2 +- external/kafka-0-10/pom.xml | 2 +- external/kafka-0-8-assembly/pom.xml | 2 +- external/kafka-0-8/pom.xml | 2 +- external/kinesis-asl-assembly/pom.xml | 2 +- external/kinesis-asl/pom.xml | 2 +- external/spark-ganglia-lgpl/pom.xml | 2 +- graphx/pom.xml | 2 +- hadoop-cloud/pom.xml | 2 +- launcher/pom.xml | 2 +- mllib-local/pom.xml | 2 +- mllib/pom.xml | 2 +- pom.xml | 2 +- project/MimaExcludes.scala | 6 +++--- python/pyspark/sql/dataframe.py | 2 +- python/pyspark/sql/functions.py | 2 +- python/pyspark/version.py | 2 +- repl/pom.xml | 2 +- resource-managers/kubernetes/core/pom.xml | 2 +- resource-managers/kubernetes/integration-tests/pom.xml | 2 +- resource-managers/mesos/pom.xml | 2 +- resource-managers/yarn/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- .../org/apache/spark/sql/catalyst/expressions/arithmetic.scala | 2 +- sql/core/pom.xml | 2 +- .../scala/org/apache/spark/sql/DataFrameStatFunctions.scala | 4 ++-- .../scala/org/apache/spark/sql/RelationalGroupedDataset.scala | 2 +- sql/core/src/main/scala/org/apache/spark/sql/functions.scala | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 50 files changed, 54 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/R/pkg/DESCRIPTION ---------------------------------------------------------------------- diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index 96090be..cdaaa61 100644 --- 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"), http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index d431d3f..b0337e5 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/kvstore/pom.xml ---------------------------------------------------------------------- diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index cdb4359..23a0f49 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/network-common/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 5a8e0eb..41fcbf0 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/network-shuffle/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 24c8675..ff71705 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/network-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 40b9267..a1cf761 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/sketch/pom.xml ---------------------------------------------------------------------- diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index c2adbf0..adbbcb1 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/tags/pom.xml ---------------------------------------------------------------------- diff --git a/common/tags/pom.xml b/common/tags/pom.xml index d0a3c7a..f6627be 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/common/unsafe/pom.xml ---------------------------------------------------------------------- diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index b0c52d9..62c493a 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index d881dc1..eff3aa1 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/docs/_config.yml ---------------------------------------------------------------------- diff --git a/docs/_config.yml b/docs/_config.yml index dfc1a73..c3ef985 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: 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 http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 6a736d5..756c475 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/avro/pom.xml ---------------------------------------------------------------------- diff --git a/external/avro/pom.xml b/external/avro/pom.xml index ee31741..9d8f319 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/docker-integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index bd3e4ad..f24254b 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/flume-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index 36bc02a..002bd6f 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/flume-sink/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 68059f0..168d9d3 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/flume/pom.xml ---------------------------------------------------------------------- diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 4335732..1410ef7 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kafka-0-10-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 668fbcd..4f9c316 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kafka-0-10-sql/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index 5b8baed..efd0862 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kafka-0-10/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 5aabef6..f59f072 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kafka-0-8-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 4a20286..83edb11 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kafka-0-8/pom.xml ---------------------------------------------------------------------- diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index 0d5e609..4545877 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kinesis-asl-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 81eea53..0bf4c26 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/kinesis-asl/pom.xml ---------------------------------------------------------------------- diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 735e781..032aca9 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/external/spark-ganglia-lgpl/pom.xml ---------------------------------------------------------------------- diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 07bc7fa..35a55b7 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/graphx/pom.xml ---------------------------------------------------------------------- diff --git a/graphx/pom.xml b/graphx/pom.xml index c0f373d..d65a8ce 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/hadoop-cloud/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index d20bdd0..d481620 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/launcher/pom.xml b/launcher/pom.xml index 7c32aad..b1b6126 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/mllib-local/pom.xml ---------------------------------------------------------------------- diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index e19c09f..ec5f9b0 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/mllib/pom.xml ---------------------------------------------------------------------- diff --git a/mllib/pom.xml b/mllib/pom.xml index e4ac94a..17ddb87 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 172a6ce..cc20c5c 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/project/MimaExcludes.scala ---------------------------------------------------------------------- diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index f4c34a1..a931738 100644 --- 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 http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/python/pyspark/sql/dataframe.py ---------------------------------------------------------------------- diff --git a/python/pyspark/sql/dataframe.py b/python/pyspark/sql/dataframe.py index 21bc69b..bf6b990 100644 --- 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): http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/python/pyspark/sql/functions.py ---------------------------------------------------------------------- diff --git a/python/pyspark/sql/functions.py b/python/pyspark/sql/functions.py index 74f0685..3128d57 100644 --- 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 * http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/python/pyspark/version.py ---------------------------------------------------------------------- diff --git a/python/pyspark/version.py b/python/pyspark/version.py index 6bd00c5..ba2a40c 100644 --- 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" http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/repl/pom.xml ---------------------------------------------------------------------- diff --git a/repl/pom.xml b/repl/pom.xml index 1712121..d2a89b2 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/resource-managers/kubernetes/core/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 06e522f..90bac19 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/resource-managers/kubernetes/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 43b7857..23453c8 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/resource-managers/mesos/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 5674036..9585bdf 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/resource-managers/yarn/pom.xml ---------------------------------------------------------------------- diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 8d5d6ab..e55b814 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/catalyst/pom.xml ---------------------------------------------------------------------- diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 224c70c..2e7df4f 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala ---------------------------------------------------------------------- diff --git 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 index f59b2a2..22b29c3 100644 --- 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 { http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/core/pom.xml ---------------------------------------------------------------------- diff --git a/sql/core/pom.xml b/sql/core/pom.xml index f78126e..2f72ff6 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameStatFunctions.scala index 75b8477..7c12432 100644 --- 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) http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/core/src/main/scala/org/apache/spark/sql/RelationalGroupedDataset.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/RelationalGroupedDataset.scala b/sql/core/src/main/scala/org/apache/spark/sql/RelationalGroupedDataset.scala index dbacdbf..d4e75b5 100644 --- 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: * * {{{ http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/core/src/main/scala/org/apache/spark/sql/functions.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala index 59a1fcb..367ac66 100644 --- 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)) http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/hive-thriftserver/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 6c8e52d..55e051c 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/sql/hive/pom.xml ---------------------------------------------------------------------- diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 0bb6026..ef22e2a 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.11</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>3.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/streaming/pom.xml ---------------------------------------------------------------------- diff --git a/streaming/pom.xml b/streaming/pom.xml index 90c8b97..f9a5029 100644 --- 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> http://git-wip-us.apache.org/repos/asf/spark/blob/9bf397c0/tools/pom.xml ---------------------------------------------------------------------- diff --git a/tools/pom.xml b/tools/pom.xml index 14ccae6..247f5a6 100644 --- 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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
