diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-09-15 00:54:20 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-09-15 00:54:20 -0700 |
| commit | 09b7e7c19897549a8622aec095f27b8b38a1a4d3 (patch) | |
| tree | ebe0de2d94c8540111c0897a0370c763f2e5546c /project | |
| parent | 6503c4b5f3cf3ba9aefc850e7874a62a218b9b0a (diff) | |
| download | spark-09b7e7c19897549a8622aec095f27b8b38a1a4d3.tar.gz spark-09b7e7c19897549a8622aec095f27b8b38a1a4d3.tar.bz2 spark-09b7e7c19897549a8622aec095f27b8b38a1a4d3.zip | |
Update version to 1.6.0-SNAPSHOT.
Author: Reynold Xin <rxin@databricks.com>
Closes #8350 from rxin/1.6.
Diffstat (limited to 'project')
| -rw-r--r-- | project/MimaBuild.scala | 2 | ||||
| -rw-r--r-- | project/MimaExcludes.scala | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/project/MimaBuild.scala b/project/MimaBuild.scala index f16bf989f2..5190526202 100644 --- a/project/MimaBuild.scala +++ b/project/MimaBuild.scala @@ -91,7 +91,7 @@ object MimaBuild { def mimaSettings(sparkHome: File, projectRef: ProjectRef) = { val organization = "org.apache.spark" - val previousSparkVersion = "1.4.0" + val previousSparkVersion = "1.5.0" val fullId = "spark-" + projectRef.project + "_2.10" mimaDefaultSettings ++ Seq(previousArtifact := Some(organization % fullId % previousSparkVersion), diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala index 3b8b6c8ffa..87b141cd3b 100644 --- a/project/MimaExcludes.scala +++ b/project/MimaExcludes.scala @@ -35,8 +35,17 @@ object MimaExcludes { def excludes(version: String) = version match { case v if v.startsWith("1.6") => Seq( - MimaBuild.excludeSparkPackage("network") - ) + MimaBuild.excludeSparkPackage("deploy"), + MimaBuild.excludeSparkPackage("network"), + // These are needed if checking against the sbt build, since they are part of + // the maven-generated artifacts in 1.3. + excludePackage("org.spark-project.jetty"), + MimaBuild.excludeSparkPackage("unused"), + // SQL execution is considered private. + excludePackage("org.apache.spark.sql.execution") + ) ++ + MimaBuild.excludeSparkClass("streaming.flume.FlumeTestUtils") ++ + MimaBuild.excludeSparkClass("streaming.flume.PollingFlumeTestUtils") case v if v.startsWith("1.5") => Seq( MimaBuild.excludeSparkPackage("network"), |