Skip to content

Commit 651f761

Browse files
gatorsmilecloud-fan
gatorsmile
authored and
cloud-fan
committed
[SPARK-23028] Bump master branch version to 2.4.0-SNAPSHOT
## What changes were proposed in this pull request? This patch bumps the master branch version to `2.4.0-SNAPSHOT`. ## How was this patch tested? N/A Author: gatorsmile <[email protected]> Closes apache#20222 from gatorsmile/bump24.
1 parent f5300fb commit 651f761

File tree

43 files changed

+49
-44
lines changed

Some content is hidden

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

43 files changed

+49
-44
lines changed

‎R/pkg/DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: SparkR
22
Type: Package
3-
Version: 2.3.0
3+
Version: 2.4.0
44
Title: R Frontend for Apache Spark
55
Description: Provides an R Frontend for Apache Spark.
66
Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"),

‎assembly/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎common/kvstore/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-common/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-shuffle/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/network-yarn/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/sketch/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/tags/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎common/unsafe/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎core/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎dev/run-tests-jenkins.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ def main():
181181
short_commit_hash = ghprb_actual_commit[0:7]
182182

183183
# format: http://linux.die.net/man/1/timeout
184-
# must be less than the timeout configured on Jenkins (currently 300m)
185-
tests_timeout = "250m"
184+
# must be less than the timeout configured on Jenkins (currently 350m)
185+
tests_timeout = "300m"
186186

187187
# Array to capture all test names to run on the pull request. These tests are represented
188188
# by their file equivalents in the dev/tests/ directory.

‎docs/_config.yml

+2-2
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: 2.3.0-SNAPSHOT
18-
SPARK_VERSION_SHORT: 2.3.0
17+
SPARK_VERSION: 2.4.0-SNAPSHOT
18+
SPARK_VERSION_SHORT: 2.4.0
1919
SCALA_BINARY_VERSION: "2.11"
2020
SCALA_VERSION: "2.11.8"
2121
MESOS_VERSION: 1.0.0

‎examples/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎external/flume-assembly/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/flume-sink/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/flume/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kinesis-asl/pom.xml

+1-1
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.11</artifactId>
23-
<version>2.3.0-SNAPSHOT</version>
23+
<version>2.4.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

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

+1-1
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.11</artifactId>
23-
<version>2.3.0-SNAPSHOT</version>
23+
<version>2.4.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎graphx/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎hadoop-cloud/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎launcher/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎mllib-local/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎mllib/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎pom.xml

+1-1
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.11</artifactId>
29-
<version>2.3.0-SNAPSHOT</version>
29+
<version>2.4.0-SNAPSHOT</version>
3030
<packaging>pom</packaging>
3131
<name>Spark Project Parent POM</name>
3232
<url>http://spark.apache.org/</url>

‎project/MimaExcludes.scala

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ import com.typesafe.tools.mima.core.ProblemFilters._
3434
*/
3535
object MimaExcludes {
3636

37+
// Exclude rules for 2.4.x
38+
lazy val v24excludes = v23excludes ++ Seq(
39+
)
40+
3741
// Exclude rules for 2.3.x
3842
lazy val v23excludes = v22excludes ++ Seq(
3943
// [SPARK-22897] Expose stageAttemptId in TaskContext
@@ -1082,6 +1086,7 @@ object MimaExcludes {
10821086
}
10831087

10841088
def excludes(version: String) = version match {
1089+
case v if v.startsWith("2.4") => v24excludes
10851090
case v if v.startsWith("2.3") => v23excludes
10861091
case v if v.startsWith("2.2") => v22excludes
10871092
case v if v.startsWith("2.1") => v21excludes

‎python/pyspark/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# See the License for the specific language governing permissions and
1717
# limitations under the License.
1818

19-
__version__ = "2.3.0.dev0"
19+
__version__ = "2.4.0.dev0"

‎repl/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

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

+1-1
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.11</artifactId>
23-
<version>2.3.0-SNAPSHOT</version>
23+
<version>2.4.0-SNAPSHOT</version>
2424
<relativePath>../../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/mesos/pom.xml

+1-1
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.11</artifactId>
23-
<version>2.3.0-SNAPSHOT</version>
23+
<version>2.4.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎resource-managers/yarn/pom.xml

+1-1
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.11</artifactId>
23-
<version>2.3.0-SNAPSHOT</version>
23+
<version>2.4.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎sql/catalyst/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎sql/core/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎sql/hive-thriftserver/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎sql/hive/pom.xml

+1-1
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.11</artifactId>
25-
<version>2.3.0-SNAPSHOT</version>
25+
<version>2.4.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎streaming/pom.xml

+1-1
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.11</artifactId>
24-
<version>2.3.0-SNAPSHOT</version>
24+
<version>2.4.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎tools/pom.xml

+1-1
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.11</artifactId>
23-
<version>2.3.0-SNAPSHOT</version>
23+
<version>2.4.0-SNAPSHOT</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

0 commit comments

Comments
 (0)