Skip to content

Commit 397d3aa

Browse files
Marcelo Vanzinpwendell
Marcelo Vanzin
authored and
pwendell
committed
Bumping version to 1.3.0-SNAPSHOT.
Author: Marcelo Vanzin <[email protected]> Closes apache#3277 from vanzin/version-1.3 and squashes the following commits: 7c3c396 [Marcelo Vanzin] Added temp repo to sbt build. 5f404ff [Marcelo Vanzin] Add another exclusion. 19457e7 [Marcelo Vanzin] Update old version to 1.2, add temporary 1.2 repo. 3c8d705 [Marcelo Vanzin] Workaround for MIMA checks. e940810 [Marcelo Vanzin] Bumping version to 1.3.0-SNAPSHOT.
1 parent 423baea commit 397d3aa

File tree

34 files changed

+63
-39
lines changed

34 files changed

+63
-39
lines changed

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

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ package org.apache
4444

4545
package object spark {
4646
// For package docs only
47-
val SPARK_VERSION = "1.2.0-SNAPSHOT"
47+
val SPARK_VERSION = "1.3.0-SNAPSHOT"
4848
}

‎docs/_config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ include:
1313

1414
# These allow the documentation to be updated with newer releases
1515
# of Spark, Scala, and Mesos.
16-
SPARK_VERSION: 1.2.0-SNAPSHOT
17-
SPARK_VERSION_SHORT: 1.2.0
16+
SPARK_VERSION: 1.3.0-SNAPSHOT
17+
SPARK_VERSION_SHORT: 1.3.0
1818
SCALA_BINARY_VERSION: "2.10"
1919
SCALA_VERSION: "2.10.4"
2020
MESOS_VERSION: 0.18.1

‎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</artifactId>
24-
<version>1.2.0-SNAPSHOT</version>
24+
<version>1.3.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</artifactId>
24-
<version>1.2.0-SNAPSHOT</version>
24+
<version>1.3.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</artifactId>
24-
<version>1.2.0-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

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

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

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

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

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

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

‎extras/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</artifactId>
23-
<version>1.2.0-SNAPSHOT</version>
23+
<version>1.3.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</artifactId>
24-
<version>1.2.0-SNAPSHOT</version>
24+
<version>1.3.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</artifactId>
24-
<version>1.2.0-SNAPSHOT</version>
24+
<version>1.3.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

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

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

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

‎pom.xml

+15-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</parent>
2727
<groupId>org.apache.spark</groupId>
2828
<artifactId>spark-parent</artifactId>
29-
<version>1.2.0-SNAPSHOT</version>
29+
<version>1.3.0-SNAPSHOT</version>
3030
<packaging>pom</packaging>
3131
<name>Spark Project Parent POM</name>
3232
<url>http://spark.apache.org/</url>
@@ -254,6 +254,18 @@
254254
<enabled>false</enabled>
255255
</snapshots>
256256
</repository>
257+
<!-- TODO: remove this as soon as 1.2.0 is published on Maven central -->
258+
<repository>
259+
<id>spark-staging-1038</id>
260+
<name>Spark 1.2.0 Staging (1038)</name>
261+
<url>https://repository.apache.org/content/repositories/orgapachespark-1038/</url>
262+
<releases>
263+
<enabled>true</enabled>
264+
</releases>
265+
<snapshots>
266+
<enabled>false</enabled>
267+
</snapshots>
268+
</repository>
257269
</repositories>
258270
<pluginRepositories>
259271
<pluginRepository>
@@ -269,7 +281,7 @@
269281
</pluginRepositories>
270282

271283
<dependencies>
272-
<!--
284+
<!--
273285
This is a dummy dependency that is used along with the shading plug-in
274286
to create effective poms on publishing (see SPARK-3812).
275287
-->
@@ -278,7 +290,7 @@
278290
<artifactId>unused</artifactId>
279291
<version>1.0.0</version>
280292
</dependency>
281-
<!--
293+
<!--
282294
This depndency has been added to provided scope as it is needed for excuting build
283295
specific groovy scripts using gmaven+ and not required for downstream project building
284296
with spark.

‎project/MimaBuild.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object MimaBuild {
3030

3131
def excludeMember(fullName: String) = Seq(
3232
ProblemFilters.exclude[MissingMethodProblem](fullName),
33-
// Sometimes excluded methods have default arguments and
33+
// Sometimes excluded methods have default arguments and
3434
// they are translated into public methods/fields($default$) in generated
3535
// bytecode. It is not possible to exhaustively list everything.
3636
// But this should be okay.
@@ -91,9 +91,9 @@ object MimaBuild {
9191

9292
def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
9393
val organization = "org.apache.spark"
94-
val previousSparkVersion = "1.1.0"
94+
val previousSparkVersion = "1.2.0"
9595
val fullId = "spark-" + projectRef.project + "_2.10"
96-
mimaDefaultSettings ++
96+
mimaDefaultSettings ++
9797
Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),
9898
binaryIssueFilters ++= ignoredABIProblems(sparkHome, version.value))
9999
}

‎project/MimaExcludes.scala

+10
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ import com.typesafe.tools.mima.core._
3333
object MimaExcludes {
3434
def excludes(version: String) =
3535
version match {
36+
case v if v.startsWith("1.3") =>
37+
Seq(
38+
MimaBuild.excludeSparkPackage("deploy"),
39+
MimaBuild.excludeSparkPackage("graphx"),
40+
// These are needed if checking against the sbt build, since they are part of
41+
// the maven-generated artifacts in the 1.2 build.
42+
MimaBuild.excludeSparkPackage("unused"),
43+
ProblemFilters.exclude[MissingClassProblem]("com.google.common.base.Optional")
44+
)
45+
3646
case v if v.startsWith("1.2") =>
3747
Seq(
3848
MimaBuild.excludeSparkPackage("deploy"),

‎project/SparkBuild.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,14 @@ object OldDeps {
210210

211211
def versionArtifact(id: String): Option[sbt.ModuleID] = {
212212
val fullId = id + "_2.10"
213-
Some("org.apache.spark" % fullId % "1.1.0")
213+
Some("org.apache.spark" % fullId % "1.2.0")
214214
}
215215

216216
def oldDepsSettings() = Defaults.coreDefaultSettings ++ Seq(
217217
name := "old-deps",
218218
scalaVersion := "2.10.4",
219+
// TODO: remove this as soon as 1.2.0 is published on Maven central.
220+
resolvers += "spark-staging-1038" at "https://repository.apache.org/content/repositories/orgapachespark-1038/",
219221
retrieveManaged := true,
220222
retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]",
221223
libraryDependencies := Seq("spark-streaming-mqtt", "spark-streaming-zeromq",
@@ -385,7 +387,7 @@ object TestSettings {
385387
javaOptions in Test ++= "-Xmx3g -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g"
386388
.split(" ").toSeq,
387389
// This places test scope jars on the classpath of executors during tests.
388-
javaOptions in Test +=
390+
javaOptions in Test +=
389391
"-Dspark.executor.extraClassPath=" + (fullClasspath in Test).value.files.
390392
map(_.getAbsolutePath).mkString(":").stripSuffix(":"),
391393
javaOptions += "-Xmx3g",

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

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

‎yarn/alpha/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>yarn-parent_2.10</artifactId>
23-
<version>1.2.0-SNAPSHOT</version>
23+
<version>1.3.0-SNAPSHOT</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626
<properties>

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

‎yarn/stable/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>yarn-parent_2.10</artifactId>
23-
<version>1.2.0-SNAPSHOT</version>
23+
<version>1.3.0-SNAPSHOT</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626
<properties>

0 commit comments

Comments
 (0)