Skip to content

Commit 007c873

Browse files
jiangxb1987jiangxb1987
committed
Prepare Spark release v3.0.0-preview-rc2
### What changes were proposed in this pull request? To push the built jars to maven release repository, we need to remove the 'SNAPSHOT' tag from the version name. Made the following changes in this PR: * Update all the `3.0.0-SNAPSHOT` version name to `3.0.0-preview` * Update the sparkR version number check logic to allow jvm version like `3.0.0-preview` **Please note those changes were generated by the release script in the past, but this time since we manually add tags on master branch, we need to manually apply those changes too.** We shall revert the changes after 3.0.0-preview release passed. ### Why are the changes needed? To make the maven release repository to accept the built jars. ### Does this PR introduce any user-facing change? No ### How was this patch tested? N/A
1 parent 155a67d commit 007c873

File tree

41 files changed

+42
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+42
-42
lines changed

‎R/pkg/R/sparkR.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ sparkR.session <- function(
337337
# Check if version number of SparkSession matches version number of SparkR package
338338
jvmVersion <- callJMethod(sparkSession, "version")
339339
# Remove -SNAPSHOT from jvm versions
340-
jvmVersionStrip <- gsub("-SNAPSHOT", "", jvmVersion)
340+
jvmVersionStrip <- gsub("-preview", "", jvmVersion)
341341
rPackageVersion <- paste0(packageVersion("SparkR"))
342342

343343
if (jvmVersionStrip != rPackageVersion) {

‎assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎common/kvstore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-shuffle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-yarn/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/sketch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/tags/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/unsafe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎docs/_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ include:
1414

1515
# These allow the documentation to be updated with newer releases
1616
# of Spark, Scala, and Mesos.
17-
SPARK_VERSION: 3.0.0-SNAPSHOT
18-
SPARK_VERSION_SHORT: 3.0.0
17+
SPARK_VERSION: 3.0.0-preview
18+
SPARK_VERSION_SHORT: 3.0.0-preview
1919
SCALA_BINARY_VERSION: "2.12"
2020
SCALA_VERSION: "2.12.10"
2121
MESOS_VERSION: 1.0.0

‎examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎external/avro/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/docker-integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎external/kafka-0-10-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10-sql/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10-token-provider/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-0-10/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎external/spark-ganglia-lgpl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎graph/api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.spark</groupId>
2525
<artifactId>spark-parent_2.12</artifactId>
26-
<version>3.0.0-SNAPSHOT</version>
26+
<version>3.0.0-preview</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎graph/cypher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.spark</groupId>
2525
<artifactId>spark-parent_2.12</artifactId>
26-
<version>3.0.0-SNAPSHOT</version>
26+
<version>3.0.0-preview</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎graph/graph/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.spark</groupId>
2525
<artifactId>spark-parent_2.12</artifactId>
26-
<version>3.0.0-SNAPSHOT</version>
26+
<version>3.0.0-preview</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

‎graphx/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎hadoop-cloud/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎launcher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎mllib-local/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎mllib/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</parent>
2727
<groupId>org.apache.spark</groupId>
2828
<artifactId>spark-parent_2.12</artifactId>
29-
<version>3.0.0-SNAPSHOT</version>
29+
<version>3.0.0-preview</version>
3030
<packaging>pom</packaging>
3131
<name>Spark Project Parent POM</name>
3232
<url>http://spark.apache.org/</url>

‎repl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎resource-managers/kubernetes/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/kubernetes/integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/mesos/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/yarn/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎sql/catalyst/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎sql/core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎sql/hive-thriftserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎sql/hive/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.12</artifactId>
25-
<version>3.0.0-SNAPSHOT</version>
25+
<version>3.0.0-preview</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎streaming/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.12</artifactId>
24-
<version>3.0.0-SNAPSHOT</version>
24+
<version>3.0.0-preview</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.spark</groupId>
2222
<artifactId>spark-parent_2.12</artifactId>
23-
<version>3.0.0-SNAPSHOT</version>
23+
<version>3.0.0-preview</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

0 commit comments

Comments
 (0)