Repository: spark Updated Branches: refs/heads/master 35db3b9fe -> c0e333dbe
[SPARK-21709][BUILD] sbt 0.13.16 and some plugin updates ## What changes were proposed in this pull request? Update sbt version to 0.13.16. I think this is a useful stepping stone to getting to sbt 1.0.0. ## How was this patch tested? Existing Build. Author: pj.fanning <pj.fann...@workday.com> Closes #18921 from pjfanning/SPARK-21709. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c0e333db Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c0e333db Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c0e333db Branch: refs/heads/master Commit: c0e333dbed2571ed995c27576c3ef616446a61ce Parents: 35db3b9 Author: pj.fanning <pj.fann...@workday.com> Authored: Sat Aug 12 20:01:20 2017 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Sat Aug 12 20:01:20 2017 +0100 ---------------------------------------------------------------------- dev/mima | 2 +- project/build.properties | 2 +- project/plugins.sbt | 13 +++++++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c0e333db/dev/mima ---------------------------------------------------------------------- diff --git a/dev/mima b/dev/mima index 85b09db..5501589 100755 --- a/dev/mima +++ b/dev/mima @@ -41,7 +41,7 @@ $JAVA_CMD \ -cp "$TOOLS_CLASSPATH:$OLD_DEPS_CLASSPATH" \ org.apache.spark.tools.GenerateMIMAIgnore -echo -e "q\n" | build/sbt -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving" +echo -e "q\n" | build/sbt -mem 4096 -DcopyDependencies=false "$@" mimaReportBinaryIssues | grep -v -e "info.*Resolving" ret_val=$? if [ $ret_val != 0 ]; then http://git-wip-us.apache.org/repos/asf/spark/blob/c0e333db/project/build.properties ---------------------------------------------------------------------- diff --git a/project/build.properties b/project/build.properties index d339865..b19518f 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.13 +sbt.version=0.13.16 http://git-wip-us.apache.org/repos/asf/spark/blob/c0e333db/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 84d1239..2b49c29 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,25 +1,34 @@ +// need to make changes to uptake sbt 1.0 support in "com.eed3si9n" % "sbt-assembly" % "1.14.5" addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2") -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.0.1") +// sbt 1.0.0 support: https://github.com/typesafehub/sbteclipse/issues/343 +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.1.0") +// sbt 1.0.0 support: https://github.com/jrudolph/sbt-dependency-graph/issues/134 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") +// need to make changes to uptake sbt 1.0 support in "org.scalastyle" %% "scalastyle-sbt-plugin" % "0.9.0" addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.12") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.17") +// sbt 1.0.0 support: https://github.com/AlpineNow/junit_xml_listener/issues/6 addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.1") +// need to make changes to uptake sbt 1.0 support in "com.eed3si9n" % "sbt-unidoc" % "0.4.1" addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") +// need to make changes to uptake sbt 1.0 support in "com.cavorite" % "sbt-avro-1-7" % "1.1.2" addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2") +// sbt 1.0.0 support: https://github.com/spray/sbt-revolver/issues/62 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") libraryDependencies += "org.ow2.asm" % "asm" % "5.1" libraryDependencies += "org.ow2.asm" % "asm-commons" % "5.1" +// sbt 1.0.0 support: https://github.com/ihji/sbt-antlr4/issues/14 addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.11") // Spark uses a custom fork of the sbt-pom-reader plugin which contains a patch to fix issues --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org