ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Prepare Spark release v3.0.0-preview-rc2

Browse source 
### 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
This commit is contained in:
Xingbo Jiang 2019-10-28 22:31:29 -07:00
parent 155a67d00c
commit 007c873ae3
41 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
R/pkg/R/sparkR.R
View file

@ -337,7 +337,7 @@ 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)
jvmVersionStrip <- gsub("-preview", "", jvmVersion)
rPackageVersion <- paste0(packageVersion("SparkR"))
if (jvmVersionStrip != rPackageVersion) {

2
assembly/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
common/kvstore/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
common/network-common/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
common/network-shuffle/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
common/network-yarn/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
common/sketch/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
common/tags/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
common/unsafe/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
core/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
docs/_config.yml
View file

@ -14,8 +14,8 @@ include:
# These allow the documentation to be updated with newer releases
# of Spark, Scala, and Mesos.
SPARK_VERSION: 3.0.0-SNAPSHOT
SPARK_VERSION_SHORT: 3.0.0
SPARK_VERSION: 3.0.0-preview
SPARK_VERSION_SHORT: 3.0.0-preview
SCALA_BINARY_VERSION: "2.12"
SCALA_VERSION: "2.12.10"
MESOS_VERSION: 1.0.0

2
examples/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
external/avro/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/docker-integration-tests/pom.xml vendored
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/kafka-0-10-assembly/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/kafka-0-10-sql/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/kafka-0-10-token-provider/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/kafka-0-10/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/kinesis-asl-assembly/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/kinesis-asl/pom.xml vendored
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
external/spark-ganglia-lgpl/pom.xml vendored
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
graph/api/pom.xml
View file

@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
graph/cypher/pom.xml
View file

@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
graph/graph/pom.xml
View file

@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
graphx/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
hadoop-cloud/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
launcher/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
mllib-local/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
mllib/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
pom.xml
View file

@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<packaging>pom</packaging>
<name>Spark Project Parent POM</name>
<url>http://spark.apache.org/</url>

2
repl/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
resource-managers/kubernetes/core/pom.xml
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
resource-managers/kubernetes/integration-tests/pom.xml
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

2
resource-managers/mesos/pom.xml
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
resource-managers/yarn/pom.xml
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
sql/catalyst/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
sql/core/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
sql/hive-thriftserver/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
sql/hive/pom.xml
View file

@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../../pom.xml</relativePath>
</parent>

2
streaming/pom.xml
View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
tools/pom.xml
View file

@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.0.0-preview</version>
<relativePath>../pom.xml</relativePath>
</parent>