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

[SPARK-25436] Bump master branch version to 2.5.0-SNAPSHOT

Browse source 
## What changes were proposed in this pull request?
In the dev list, we can still discuss whether the next version is 2.5.0 or 3.0.0. Let us first bump the master branch version to `2.5.0-SNAPSHOT`.

## How was this patch tested?
N/A

Closes #22426 from gatorsmile/bumpVersionMaster.

Authored-by: gatorsmile <gatorsmile@gmail.com>
Signed-off-by: gatorsmile <gatorsmile@gmail.com>
This commit is contained in:
gatorsmile 2018-09-15 16:24:02 -07:00
parent 5ebef33c85
commit bb2f069cf2
44 changed files with 49 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
R/pkg/DESCRIPTION
View file

@ -1,6 +1,6 @@
Package: SparkR Package: SparkR
Type: Package Type: Package
Version: 2.4.0 Version: 2.5.0
Title: R Frontend for Apache Spark Title: R Frontend for Apache Spark
Description: Provides an R Frontend for Apache Spark. Description: Provides an R Frontend for Apache Spark.
Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"), Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"),

2
assembly/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
common/kvstore/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
common/sketch/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
common/tags/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
common/unsafe/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
core/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

4
docs/_config.yml
View file

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

2
examples/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
external/avro/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
external/flume-assembly/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
external/flume-sink/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
external/flume/pom.xml vendored
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
graphx/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
hadoop-cloud/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
launcher/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
mllib-local/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
mllib/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
pom.xml
View file

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

5
project/MimaExcludes.scala
View file

@ -34,6 +34,10 @@ import com.typesafe.tools.mima.core.ProblemFilters._
*/ */
object MimaExcludes { object MimaExcludes {
// Exclude rules for 2.5.x
lazy val v25excludes = v24excludes ++ Seq(
)
// Exclude rules for 2.4.x // Exclude rules for 2.4.x
lazy val v24excludes = v23excludes ++ Seq( lazy val v24excludes = v23excludes ++ Seq(
// [SPARK-23429][CORE] Add executor memory metrics to heartbeat and expose in executors REST API // [SPARK-23429][CORE] Add executor memory metrics to heartbeat and expose in executors REST API
@ -1202,6 +1206,7 @@ object MimaExcludes {
} }
def excludes(version: String) = version match { def excludes(version: String) = version match {
case v if v.startsWith("2.5") => v25excludes
case v if v.startsWith("2.4") => v24excludes case v if v.startsWith("2.4") => v24excludes
case v if v.startsWith("2.3") => v23excludes case v if v.startsWith("2.3") => v23excludes
case v if v.startsWith("2.2") => v22excludes case v if v.startsWith("2.2") => v22excludes

2
python/pyspark/version.py
View file

@ -16,4 +16,4 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
__version__ = "2.4.0.dev0" __version__ = "2.5.0.dev0"

2
repl/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath> <relativePath>../../../pom.xml</relativePath>
</parent> </parent>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath> <relativePath>../../../pom.xml</relativePath>
</parent> </parent>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
sql/catalyst/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
sql/core/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

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

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
sql/hive/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

2
streaming/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
tools/pom.xml
View file

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.apache.spark</groupId> <groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.11</artifactId> <artifactId>spark-parent_2.11</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.5.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>