From f0d465e09b8d89d5e56ec21f4bd7e3ecbeeb318a Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Mon, 16 Sep 2024 03:31:26 +0000 Subject: [PATCH] Preparing Spark release v4.0.0-preview2-rc1 --- R/pkg/R/sparkR.R | 4 ++-- 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 +- common/utils/pom.xml | 2 +- common/variant/pom.xml | 2 +- connector/avro/pom.xml | 2 +- connector/connect/client/jvm/pom.xml | 2 +- connector/docker-integration-tests/pom.xml | 2 +- connector/kafka-0-10-assembly/pom.xml | 2 +- connector/kafka-0-10-sql/pom.xml | 2 +- connector/kafka-0-10-token-provider/pom.xml | 2 +- connector/kafka-0-10/pom.xml | 2 +- connector/kinesis-asl-assembly/pom.xml | 2 +- connector/kinesis-asl/pom.xml | 2 +- connector/profiler/pom.xml | 2 +- connector/protobuf/pom.xml | 2 +- connector/spark-ganglia-lgpl/pom.xml | 2 +- core/pom.xml | 2 +- docs/_config.yml | 6 +++--- examples/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 +- 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/yarn/pom.xml | 2 +- sql/api/pom.xml | 2 +- sql/catalyst/pom.xml | 2 +- sql/connect/common/pom.xml | 2 +- sql/connect/server/pom.xml | 2 +- sql/core/pom.xml | 2 +- sql/hive-thriftserver/pom.xml | 2 +- sql/hive/pom.xml | 2 +- streaming/pom.xml | 2 +- tools/pom.xml | 2 +- 46 files changed, 49 insertions(+), 49 deletions(-) diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R index 29c05b0db7c2d..2b57ca77a4ed5 100644 --- a/R/pkg/R/sparkR.R +++ b/R/pkg/R/sparkR.R @@ -461,8 +461,8 @@ sparkR.session <- function( # Check if version number of SparkSession matches version number of SparkR package jvmVersion <- callJMethod(sparkSession, "version") - # Remove -SNAPSHOT from jvm versions - jvmVersionStrip <- gsub("-SNAPSHOT", "", jvmVersion, fixed = TRUE) + # Remove -preview2 from jvm versions + jvmVersionStrip <- gsub("-preview2", "", jvmVersion, fixed = TRUE) rPackageVersion <- paste0(packageVersion("SparkR")) if (jvmVersionStrip != rPackageVersion) { diff --git a/assembly/pom.xml b/assembly/pom.xml index 01bd324efc118..b72cf3ef3f3b2 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index 046648e9c2aec..322279d66e176 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index cdb5bd72158a1..93bca7177ce0a 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 0f7036ef746cc..ed52fe0163dc1 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index 3f2ae21eeb3be..5ebd336804929 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index e3f3d4127b717..976b5f8df107d 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 1894b6f4acb76..52457f2570e36 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index a5ef9847859a7..b5dcdf53b87b6 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/utils/pom.xml b/common/utils/pom.xml index 1dbf2a769fff8..612a0dad82d19 100644 --- a/common/utils/pom.xml +++ b/common/utils/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/common/variant/pom.xml b/common/variant/pom.xml index 73d41802785a5..5a8761828a024 100644 --- a/common/variant/pom.xml +++ b/common/variant/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/avro/pom.xml b/connector/avro/pom.xml index 412486b3fca46..5e56702cee157 100644 --- a/connector/avro/pom.xml +++ b/connector/avro/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml index be358f317481e..c8f12d27641f4 100644 --- a/connector/connect/client/jvm/pom.xml +++ b/connector/connect/client/jvm/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../../../pom.xml diff --git a/connector/docker-integration-tests/pom.xml b/connector/docker-integration-tests/pom.xml index 9003c2190be22..d8a6971770cfb 100644 --- a/connector/docker-integration-tests/pom.xml +++ b/connector/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/kafka-0-10-assembly/pom.xml b/connector/kafka-0-10-assembly/pom.xml index b2fcbdf8eca7d..14973d9f7d02b 100644 --- a/connector/kafka-0-10-assembly/pom.xml +++ b/connector/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/kafka-0-10-sql/pom.xml b/connector/kafka-0-10-sql/pom.xml index 35f58134f1a85..e35aff43683aa 100644 --- a/connector/kafka-0-10-sql/pom.xml +++ b/connector/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/kafka-0-10-token-provider/pom.xml b/connector/kafka-0-10-token-provider/pom.xml index 2b2707b9da320..cf6fba2e692d3 100644 --- a/connector/kafka-0-10-token-provider/pom.xml +++ b/connector/kafka-0-10-token-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/kafka-0-10/pom.xml b/connector/kafka-0-10/pom.xml index 1b26839a371ce..00846f54e256b 100644 --- a/connector/kafka-0-10/pom.xml +++ b/connector/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/kinesis-asl-assembly/pom.xml b/connector/kinesis-asl-assembly/pom.xml index 577ec21530837..4d0ff3ffe7c27 100644 --- a/connector/kinesis-asl-assembly/pom.xml +++ b/connector/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/kinesis-asl/pom.xml b/connector/kinesis-asl/pom.xml index 9a7f40443bbc9..aae6a4073d30a 100644 --- a/connector/kinesis-asl/pom.xml +++ b/connector/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/profiler/pom.xml b/connector/profiler/pom.xml index 6b254dbae128c..bce297c167b41 100644 --- a/connector/profiler/pom.xml +++ b/connector/profiler/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/protobuf/pom.xml b/connector/protobuf/pom.xml index 8c52576c3531f..03df615f3da08 100644 --- a/connector/protobuf/pom.xml +++ b/connector/protobuf/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/connector/spark-ganglia-lgpl/pom.xml b/connector/spark-ganglia-lgpl/pom.xml index 4c9a0c7347e64..b4f56f26e797f 100644 --- a/connector/spark-ganglia-lgpl/pom.xml +++ b/connector/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 19f58940ed942..ad9ef2ec30beb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/docs/_config.yml b/docs/_config.yml index e74eda0470417..3877d04c9e32b 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -19,8 +19,8 @@ include: # These allow the documentation to be updated with newer releases # of Spark, Scala. -SPARK_VERSION: 4.0.0-SNAPSHOT -SPARK_VERSION_SHORT: 4.0.0 +SPARK_VERSION: 4.0.0-preview2 +SPARK_VERSION_SHORT: 4.0.0-preview2 SCALA_BINARY_VERSION: "2.13" SCALA_VERSION: "2.13.14" SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK @@ -39,7 +39,7 @@ DOCSEARCH_SCRIPT: | inputSelector: '#docsearch-input', enhancedSearchInput: true, algoliaOptions: { - 'facetFilters': ["version:latest"] + 'facetFilters': ["version:4.0.0-preview2"] }, debug: false // Set debug to true if you want to inspect the dropdown }); diff --git a/examples/pom.xml b/examples/pom.xml index 9470f13ecfc2c..429eb25f11b93 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index ce29c1845422a..68f9d4313775d 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 9c2f21e7ab617..1fb145df4fb1a 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index c47244ff887a6..faeb3159e2f10 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index ecfe45f046f2b..0cf6a7bb171ae 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 4f983a325a0c1..371470f4d06a5 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/pom.xml b/pom.xml index b9f28eb619258..cc152ac7342f7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 pom Spark Project Parent POM https://spark.apache.org/ diff --git a/python/pyspark/version.py b/python/pyspark/version.py index 4e544f481c3ff..8530b9d215fdb 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__: str = "4.0.0.dev0" +__version__: str = "4.0.0-preview2" diff --git a/repl/pom.xml b/repl/pom.xml index 831379467a29e..56ff4f7f6ad88 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 211c6c93b9674..4db7d68b4a7bf 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 45ce25b8e037a..67eccaf40146f 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 694d81b3c25e3..bb55b188baec3 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/sql/api/pom.xml b/sql/api/pom.xml index 54cdc96fc40a2..a7483785c9e77 100644 --- a/sql/api/pom.xml +++ b/sql/api/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index ac944eb9d8070..6cc2cd8460c59 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/sql/connect/common/pom.xml b/sql/connect/common/pom.xml index b0f015246f4c9..388eecefc1e25 100644 --- a/sql/connect/common/pom.xml +++ b/sql/connect/common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../../pom.xml diff --git a/sql/connect/server/pom.xml b/sql/connect/server/pom.xml index 3350c4261e9da..c5f4df5b4ad25 100644 --- a/sql/connect/server/pom.xml +++ b/sql/connect/server/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 9eb5decb3b515..46d95b8b21766 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 6a352f8a530d7..99a40623ecede 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 5a325f5f56bfc..63eee97252ed1 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index 85a4d268d2a25..b508e467043cf 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index b1fd06c4ef6c2..ca4dc3a25dab1 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.13 - 4.0.0-SNAPSHOT + 4.0.0-preview2 ../pom.xml