Skip to content

Commit 36f549b

Browse files
pwendellpwendell
committed
[SPARK-7801] [BUILD] Updating versions to SPARK 1.5.0
1 parent 4f57200 commit 36f549b

File tree

34 files changed

+57
-34
lines changed

34 files changed

+57
-34
lines changed

‎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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎bagel/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎core/src/main/scala/org/apache/spark/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ package org.apache
4343

4444
package object spark {
4545
// For package docs only
46-
val SPARK_VERSION = "1.4.0-SNAPSHOT"
46+
val SPARK_VERSION = "1.5.0-SNAPSHOT"
4747
}

‎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: 1.4.0-SNAPSHOT
18-
SPARK_VERSION_SHORT: 1.4.0
17+
SPARK_VERSION: 1.5.0-SNAPSHOT
18+
SPARK_VERSION_SHORT: 1.5.0
1919
SCALA_BINARY_VERSION: "2.10"
2020
SCALA_VERSION: "2.10.4"
2121
MESOS_VERSION: 0.21.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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎external/flume-sink/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/flume/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka-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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/kafka/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/mqtt/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/twitter/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎external/zeromq/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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

‎extras/java8-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.10</artifactId>
23-
<version>1.4.0-SNAPSHOT</version>
23+
<version>1.5.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎extras/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.10</artifactId>
23-
<version>1.4.0-SNAPSHOT</version>
23+
<version>1.5.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎extras/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.10</artifactId>
23-
<version>1.4.0-SNAPSHOT</version>
23+
<version>1.5.0-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

‎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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

‎pom.xml

Lines changed: 13 additions & 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.10</artifactId>
29-
<version>1.4.0-SNAPSHOT</version>
29+
<version>1.5.0-SNAPSHOT</version>
3030
<packaging>pom</packaging>
3131
<name>Spark Project Parent POM</name>
3232
<url>http://spark.apache.org/</url>
@@ -269,6 +269,18 @@
269269
<enabled>false</enabled>
270270
</snapshots>
271271
</repository>
272+
<!-- TODO: This can be deleted after Spark 1.4 is posted -->
273+
<repository>
274+
<id>spark-1.4-staging</id>
275+
<name>Spark 1.4 RC1 Staging Repository</name>
276+
<url>https://repository.apache.org/content/repositories/orgapachespark-1092</url>
277+
<releases>
278+
<enabled>true</enabled>
279+
</releases>
280+
<snapshots>
281+
<enabled>false</enabled>
282+
</snapshots>
283+
</repository>
272284
</repositories>
273285
<pluginRepositories>
274286
<pluginRepository>

‎project/MimaBuild.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ object MimaBuild {
9191

9292
def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
9393
val organization = "org.apache.spark"
94-
val previousSparkVersion = "1.3.0"
94+
val previousSparkVersion = "1.4.0"
9595
val fullId = "spark-" + projectRef.project + "_2.10"
9696
mimaDefaultSettings ++
9797
Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),

‎project/MimaExcludes.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,17 @@ import com.typesafe.tools.mima.core.ProblemFilters._
3434
object MimaExcludes {
3535
def excludes(version: String) =
3636
version match {
37+
case v if v.startsWith("1.5") =>
38+
Seq(
39+
MimaBuild.excludeSparkPackage("deploy"),
40+
// These are needed if checking against the sbt build, since they are part of
41+
// the maven-generated artifacts in 1.3.
42+
excludePackage("org.spark-project.jetty"),
43+
MimaBuild.excludeSparkPackage("unused"),
44+
// SPARK-7805 - Some SQL test code accidentally included in src/main
45+
ProblemFilters.exclude[MissingMethodProblem](
46+
"org.apache.spark.sql.test.SQLTestUtils.withTable")
47+
)
3748
case v if v.startsWith("1.4") =>
3849
Seq(
3950
MimaBuild.excludeSparkPackage("deploy"),

‎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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

‎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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</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.10</artifactId>
24-
<version>1.4.0-SNAPSHOT</version>
24+
<version>1.5.0-SNAPSHOT</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.10</artifactId>
23-
<version>1.4.0-SNAPSHOT</version>
23+
<version>1.5.0-SNAPSHOT</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

‎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.10</artifactId>
25-
<version>1.4.0-SNAPSHOT</version>
25+
<version>1.5.0-SNAPSHOT</version>
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

‎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.10</artifactId>
23-
<version>1.4.0-SNAPSHOT</version>
23+
<version>1.5.0-SNAPSHOT</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

0 commit comments

Comments
 (0)