Bumping version to 1.3.0-SNAPSHOT.
Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #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.
This commit is contained in:
parent
423baea953
commit
397d3aae5b
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -44,5 +44,5 @@ package org.apache
|
|||
|
||||
package object spark {
|
||||
// For package docs only
|
||||
val SPARK_VERSION = "1.2.0-SNAPSHOT"
|
||||
val SPARK_VERSION = "1.3.0-SNAPSHOT"
|
||||
}
|
||||
|
|
|
@ -13,8 +13,8 @@ include:
|
|||
|
||||
# These allow the documentation to be updated with newer releases
|
||||
# of Spark, Scala, and Mesos.
|
||||
SPARK_VERSION: 1.2.0-SNAPSHOT
|
||||
SPARK_VERSION_SHORT: 1.2.0
|
||||
SPARK_VERSION: 1.3.0-SNAPSHOT
|
||||
SPARK_VERSION_SHORT: 1.3.0
|
||||
SCALA_BINARY_VERSION: "2.10"
|
||||
SCALA_VERSION: "2.10.4"
|
||||
MESOS_VERSION: 0.18.1
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/flume-sink/pom.xml
vendored
2
external/flume-sink/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/flume/pom.xml
vendored
2
external/flume/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/kafka/pom.xml
vendored
2
external/kafka/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/mqtt/pom.xml
vendored
2
external/mqtt/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/twitter/pom.xml
vendored
2
external/twitter/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
2
external/zeromq/pom.xml
vendored
2
external/zeromq/pom.xml
vendored
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
18
pom.xml
18
pom.xml
|
@ -26,7 +26,7 @@
|
|||
</parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Spark Project Parent POM</name>
|
||||
<url>http://spark.apache.org/</url>
|
||||
|
@ -254,6 +254,18 @@
|
|||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<!-- TODO: remove this as soon as 1.2.0 is published on Maven central -->
|
||||
<repository>
|
||||
<id>spark-staging-1038</id>
|
||||
<name>Spark 1.2.0 Staging (1038)</name>
|
||||
<url>https://repository.apache.org/content/repositories/orgapachespark-1038/</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
|
@ -269,7 +281,7 @@
|
|||
</pluginRepositories>
|
||||
|
||||
<dependencies>
|
||||
<!--
|
||||
<!--
|
||||
This is a dummy dependency that is used along with the shading plug-in
|
||||
to create effective poms on publishing (see SPARK-3812).
|
||||
-->
|
||||
|
@ -278,7 +290,7 @@
|
|||
<artifactId>unused</artifactId>
|
||||
<version>1.0.0</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<!--
|
||||
This depndency has been added to provided scope as it is needed for excuting build
|
||||
specific groovy scripts using gmaven+ and not required for downstream project building
|
||||
with spark.
|
||||
|
|
|
@ -30,7 +30,7 @@ object MimaBuild {
|
|||
|
||||
def excludeMember(fullName: String) = Seq(
|
||||
ProblemFilters.exclude[MissingMethodProblem](fullName),
|
||||
// Sometimes excluded methods have default arguments and
|
||||
// Sometimes excluded methods have default arguments and
|
||||
// they are translated into public methods/fields($default$) in generated
|
||||
// bytecode. It is not possible to exhaustively list everything.
|
||||
// But this should be okay.
|
||||
|
@ -91,9 +91,9 @@ object MimaBuild {
|
|||
|
||||
def mimaSettings(sparkHome: File, projectRef: ProjectRef) = {
|
||||
val organization = "org.apache.spark"
|
||||
val previousSparkVersion = "1.1.0"
|
||||
val previousSparkVersion = "1.2.0"
|
||||
val fullId = "spark-" + projectRef.project + "_2.10"
|
||||
mimaDefaultSettings ++
|
||||
mimaDefaultSettings ++
|
||||
Seq(previousArtifact := Some(organization % fullId % previousSparkVersion),
|
||||
binaryIssueFilters ++= ignoredABIProblems(sparkHome, version.value))
|
||||
}
|
||||
|
|
|
@ -33,6 +33,16 @@ import com.typesafe.tools.mima.core._
|
|||
object MimaExcludes {
|
||||
def excludes(version: String) =
|
||||
version match {
|
||||
case v if v.startsWith("1.3") =>
|
||||
Seq(
|
||||
MimaBuild.excludeSparkPackage("deploy"),
|
||||
MimaBuild.excludeSparkPackage("graphx"),
|
||||
// These are needed if checking against the sbt build, since they are part of
|
||||
// the maven-generated artifacts in the 1.2 build.
|
||||
MimaBuild.excludeSparkPackage("unused"),
|
||||
ProblemFilters.exclude[MissingClassProblem]("com.google.common.base.Optional")
|
||||
)
|
||||
|
||||
case v if v.startsWith("1.2") =>
|
||||
Seq(
|
||||
MimaBuild.excludeSparkPackage("deploy"),
|
||||
|
|
|
@ -210,12 +210,14 @@ object OldDeps {
|
|||
|
||||
def versionArtifact(id: String): Option[sbt.ModuleID] = {
|
||||
val fullId = id + "_2.10"
|
||||
Some("org.apache.spark" % fullId % "1.1.0")
|
||||
Some("org.apache.spark" % fullId % "1.2.0")
|
||||
}
|
||||
|
||||
def oldDepsSettings() = Defaults.coreDefaultSettings ++ Seq(
|
||||
name := "old-deps",
|
||||
scalaVersion := "2.10.4",
|
||||
// TODO: remove this as soon as 1.2.0 is published on Maven central.
|
||||
resolvers += "spark-staging-1038" at "https://repository.apache.org/content/repositories/orgapachespark-1038/",
|
||||
retrieveManaged := true,
|
||||
retrievePattern := "[type]s/[artifact](-[revision])(-[classifier]).[ext]",
|
||||
libraryDependencies := Seq("spark-streaming-mqtt", "spark-streaming-zeromq",
|
||||
|
@ -385,7 +387,7 @@ object TestSettings {
|
|||
javaOptions in Test ++= "-Xmx3g -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g"
|
||||
.split(" ").toSeq,
|
||||
// This places test scope jars on the classpath of executors during tests.
|
||||
javaOptions in Test +=
|
||||
javaOptions in Test +=
|
||||
"-Dspark.executor.extraClassPath=" + (fullClasspath in Test).value.files.
|
||||
map(_.getAbsolutePath).mkString(":").stripSuffix(":"),
|
||||
javaOptions += "-Xmx3g",
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>yarn-parent_2.10</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<properties>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>spark-parent</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<parent>
|
||||
<groupId>org.apache.spark</groupId>
|
||||
<artifactId>yarn-parent_2.10</artifactId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<properties>
|
||||
|
|
Loading…
Reference in a new issue