Revert "Prepare Spark release v3.0.0-preview-rc2"
This reverts commit 007c873ae3
.
This commit is contained in:
parent
007c873ae3
commit
8207c835b4
|
@ -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("-preview", "", jvmVersion)
|
||||
jvmVersionStrip <- gsub("-SNAPSHOT", "", jvmVersion)
|
||||
rPackageVersion <- paste0(packageVersion("SparkR"))
|
||||
|
||||
if (jvmVersionStrip != rPackageVersion) {
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -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-preview
|
||||
SPARK_VERSION_SHORT: 3.0.0-preview
|
||||
SPARK_VERSION: 3.0.0-SNAPSHOT
|
||||
SPARK_VERSION_SHORT: 3.0.0
|
||||
SCALA_BINARY_VERSION: "2.12"
|
||||
SCALA_VERSION: "2.12.10"
|
||||
MESOS_VERSION: 1.0.0
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/avro/pom.xml
vendored
2
external/avro/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/docker-integration-tests/pom.xml
vendored
2
external/docker-integration-tests/pom.xml
vendored
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kafka-0-10-assembly/pom.xml
vendored
2
external/kafka-0-10-assembly/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kafka-0-10-sql/pom.xml
vendored
2
external/kafka-0-10-sql/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kafka-0-10-token-provider/pom.xml
vendored
2
external/kafka-0-10-token-provider/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kafka-0-10/pom.xml
vendored
2
external/kafka-0-10/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kinesis-asl-assembly/pom.xml
vendored
2
external/kinesis-asl-assembly/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kinesis-asl/pom.xml
vendored
2
external/kinesis-asl/pom.xml
vendored
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/spark-ganglia-lgpl/pom.xml
vendored
2
external/spark-ganglia-lgpl/pom.xml
vendored
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -26,7 +26,7 @@
|
|||
</parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Spark Project Parent POM</name>
|
||||
<url>http://spark.apache.org/</url>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent_2.12</artifactId>
|
||||
<version>3.0.0-preview</version>
|
||||
<version>3.0.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
Loading…
Reference in a new issue