Repository: spark Updated Branches: refs/heads/master 054f991c4 -> 7226e1906
[SPARK-14511][BUILD] Upgrade genjavadoc to latest upstream ## What changes were proposed in this pull request? In the past, genjavadoc had issues with package private members which led the spark project to use a forked version. This issue has been fixed upstream (typesafehub/genjavadoc#70) and a release is available for scala versions 2.10, 2.11 **and 2.12**, hence a forked version for spark is no longer necessary. This pull request updates the build configuration to use the newest upstream genjavadoc. ## How was this patch tested? The build was run `sbt unidoc`. During the process javadoc emits some errors on the generated java stubs, however these errors were also present before the upgrade. Furthermore, the produced html is fine. Author: Jakob Odersky <[email protected]> Closes #12707 from jodersky/SPARK-14511-genjavadoc. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7226e190 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7226e190 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7226e190 Branch: refs/heads/master Commit: 7226e1906796e1755dcb5c66fe8359f91e443afd Parents: 054f991 Author: Jakob Odersky <[email protected]> Authored: Fri Apr 29 10:10:20 2016 +0100 Committer: Sean Owen <[email protected]> Committed: Fri Apr 29 10:10:20 2016 +0100 ---------------------------------------------------------------------- project/SparkBuild.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7226e190/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index ffbca25..f7781e0 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -147,8 +147,12 @@ object SparkBuild extends PomBuild { lazy val sparkGenjavadocSettings: Seq[sbt.Def.Setting[_]] = Seq( libraryDependencies += compilerPlugin( - "org.spark-project" %% "genjavadoc-plugin" % unidocGenjavadocVersion.value cross CrossVersion.full), - scalacOptions <+= target.map(t => "-P:genjavadoc:out=" + (t / "java"))) + "com.typesafe.genjavadoc" %% "genjavadoc-plugin" % unidocGenjavadocVersion.value cross CrossVersion.full), + scalacOptions ++= Seq( + "-P:genjavadoc:out=" + (target.value / "java"), + "-P:genjavadoc:strictVisibility=true" // hide package private types + ) + ) lazy val scalaStyleRules = Project("scalaStyleRules", file("scalastyle")) .settings( @@ -237,7 +241,7 @@ object SparkBuild extends PomBuild { .map(file), incOptions := incOptions.value.withNameHashing(true), publishMavenStyle := true, - unidocGenjavadocVersion := "0.9-spark0", + unidocGenjavadocVersion := "0.10", // Override SBT's default resolvers: resolvers := Seq( --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
