diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2014-11-18 21:24:18 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-18 21:24:18 -0800 |
| commit | 397d3aae5bde96b01b4968dde048b6898bb6c914 (patch) | |
| tree | 638695a60173066a5162181c2ca21bc9f925550b /project/SparkBuild.scala | |
| parent | 423baea953996a66dde671ff6db2fb1f32fbe8cb (diff) | |
| download | spark-397d3aae5bde96b01b4968dde048b6898bb6c914.tar.gz spark-397d3aae5bde96b01b4968dde048b6898bb6c914.tar.bz2 spark-397d3aae5bde96b01b4968dde048b6898bb6c914.zip | |
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.
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c1879ce4ba..efc48e7f67 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -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", |