diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-04-29 10:10:20 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-04-29 10:10:20 +0100 |
| commit | 7226e1906796e1755dcb5c66fe8359f91e443afd (patch) | |
| tree | e04975128584db8e11bc6ca24f37c2620458b675 /project | |
| parent | 054f991c4350af1350af7a4109ee77f4a34822f0 (diff) | |
| download | spark-7226e1906796e1755dcb5c66fe8359f91e443afd.tar.gz spark-7226e1906796e1755dcb5c66fe8359f91e443afd.tar.bz2 spark-7226e1906796e1755dcb5c66fe8359f91e443afd.zip | |
[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 <jakob@odersky.com>
Closes #12707 from jodersky/SPARK-14511-genjavadoc.
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index ffbca25e46..f7781e0ef1 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( |