Repository: spark
Updated Branches:
refs/heads/master f3daa099b -> 473263f95
[SPARK-13834][BUILD] Update sbt and sbt plugins for 2.x.
## What changes were proposed in this pull request?
For 2.0.0, we had better make **sbt** and **sbt plugins** up-to-date. This PR
checks the status of each plugins and bumps the followings.
* sbt: 0.13.9 --> 0.13.11
* sbteclipse-plugin: 2.2.0 --> 4.0.0
* sbt-dependency-graph: 0.7.4 --> 0.8.2
* sbt-mima-plugin: 0.1.6 --> 0.1.9
* sbt-revolver: 0.7.2 --> 0.8.0
All other plugins are up-to-date. (Note that `sbt-avro` seems to be change from
0.3.2 to 1.0.1, but it's not published in the repository.)
During upgrade, this PR also updated the following MiMa error. Note that the
related excluding filter is already registered correctly. It seems due to the
change of MiMa exception result.
```
// SPARK-12896 Send only accumulator updates to driver, not TaskMetrics
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulable.this"),
-ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulator.this"),
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.Accumulator.this"),
```
## How was this patch tested?
Pass the Jenkins build.
Author: Dongjoon Hyun <dongj...@apache.org>
Closes #11669 from dongjoon-hyun/update_mima.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/473263f9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/473263f9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/473263f9
Branch: refs/heads/master
Commit: 473263f9598d1cf880f421aae1b51eb0b6e3cf79
Parents: f3daa09
Author: Dongjoon Hyun <dongj...@apache.org>
Authored: Sun Mar 13 18:47:04 2016 -0700
Committer: Reynold Xin <r...@databricks.com>
Committed: Sun Mar 13 18:47:04 2016 -0700
----------------------------------------------------------------------
dev/mima | 2 +-
project/MimaExcludes.scala | 2 +-
project/SparkBuild.scala | 5 ++---
project/build.properties | 2 +-
project/plugins.sbt | 8 ++++----
5 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/473263f9/dev/mima
----------------------------------------------------------------------
diff --git a/dev/mima b/dev/mima
index b7f8d62..c8e2df6 100755
--- a/dev/mima
+++ b/dev/mima
@@ -40,7 +40,7 @@ SPARK_PROFILES="-Pyarn -Pspark-ganglia-lgpl -Pkinesis-asl
-Phive-thriftserver -P
generate_mima_ignore "$(build/sbt $SPARK_PROFILES "export
assembly/fullClasspath" | tail -n1)"
generate_mima_ignore "$(build/sbt $SPARK_PROFILES "export
oldDeps/fullClasspath" | tail -n1)"
-echo -e "q\n" | build/sbt mima-report-binary-issues | grep -v -e
"info.*Resolving"
+echo -e "q\n" | build/sbt mimaReportBinaryIssues | grep -v -e "info.*Resolving"
ret_val=$?
if [ $ret_val != 0 ]; then
http://git-wip-us.apache.org/repos/asf/spark/blob/473263f9/project/MimaExcludes.scala
----------------------------------------------------------------------
diff --git a/project/MimaExcludes.scala b/project/MimaExcludes.scala
index 567a717..c4c8d88 100644
--- a/project/MimaExcludes.scala
+++ b/project/MimaExcludes.scala
@@ -192,7 +192,7 @@ object MimaExcludes {
) ++ Seq(
// SPARK-12896 Send only accumulator updates to driver, not TaskMetrics
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulable.this"),
-
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.spark.Accumulator.this"),
+
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.spark.Accumulator.this"),
ProblemFilters.exclude[MissingMethodProblem]("org.apache.spark.Accumulator.initialValue")
) ++ Seq(
// SPARK-12692 Scala style: Fix the style violation (Space before ","
or ":")
http://git-wip-us.apache.org/repos/asf/spark/blob/473263f9/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e74fb17..d1c67ea 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -26,7 +26,6 @@ import sbt.Classpaths.publishTask
import sbt.Keys._
import sbtunidoc.Plugin.UnidocKeys.unidocGenjavadocVersion
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
-import net.virtualvoid.sbt.graph.Plugin.graphSettings
import spray.revolver.RevolverPlugin._
@@ -144,7 +143,7 @@ object SparkBuild extends PomBuild {
"org.spark-project" %% "genjavadoc-plugin" %
unidocGenjavadocVersion.value cross CrossVersion.full),
scalacOptions <+= target.map(t => "-P:genjavadoc:out=" + (t / "java")))
- lazy val sharedSettings = graphSettings ++ sparkGenjavadocSettings ++ Seq (
+ lazy val sharedSettings = sparkGenjavadocSettings ++ Seq (
javaHome := sys.env.get("JAVA_HOME")
.orElse(sys.props.get("java.home").map { p => new
File(p).getParentFile().getAbsolutePath() })
.map(file),
@@ -241,7 +240,7 @@ object SparkBuild extends PomBuild {
/* Enable shared settings on all projects */
(allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark,
tools))
.foreach(enable(sharedSettings ++ DependencyOverrides.settings ++
- ExcludedDependencies.settings ++ Revolver.settings))
+ ExcludedDependencies.settings))
/* Enable tests settings for all projects except examples, assembly and
tools */
(allProjects ++
optionallyEnabledProjects).foreach(enable(TestSettings.settings))
http://git-wip-us.apache.org/repos/asf/spark/blob/473263f9/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
index 86ca875..1e38156 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-sbt.version=0.13.9
+sbt.version=0.13.11
http://git-wip-us.apache.org/repos/asf/spark/blob/473263f9/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 822a7c4..eeca94a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,14 +1,14 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
-addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")
addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.1")
@@ -16,7 +16,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3")
addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2")
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.7.2")
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
libraryDependencies += "org.ow2.asm" % "asm" % "5.0.3"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
