diff options
| author | Takuya UESHIN <ueshin@happy-camper.st> | 2014-11-28 13:00:15 -0500 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-11-28 13:00:29 -0500 |
| commit | 32198347ffb71f72f37e4bded262da80452a5aea (patch) | |
| tree | dcdf61a8ba695cabed345c877fe8c71eaa17e455 /project | |
| parent | 8cf12279969afe5099c66ad16897db366e7234ed (diff) | |
| download | spark-32198347ffb71f72f37e4bded262da80452a5aea.tar.gz spark-32198347ffb71f72f37e4bded262da80452a5aea.tar.bz2 spark-32198347ffb71f72f37e4bded262da80452a5aea.zip | |
[SPARK-4193][BUILD] Disable doclint in Java 8 to prevent from build error.
Author: Takuya UESHIN <ueshin@happy-camper.st>
Closes #3058 from ueshin/issues/SPARK-4193 and squashes the following commits:
e096bb1 [Takuya UESHIN] Add a plugin declaration to pluginManagement.
6762ec2 [Takuya UESHIN] Fix usage of -Xdoclint javadoc option.
fdb280a [Takuya UESHIN] Fix Javadoc errors.
4745f3c [Takuya UESHIN] Merge branch 'master' into issues/SPARK-4193
923e2f0 [Takuya UESHIN] Use doclint option `-missing` instead of `none`.
30d6718 [Takuya UESHIN] Fix Javadoc errors.
b548017 [Takuya UESHIN] Disable doclint in Java 8 to prevent from build error.
(cherry picked from commit e464f0ac2d7210a4bf715478885fe7a8d397fe89)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d539a3d91a..f73e0f6795 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -136,7 +136,12 @@ object SparkBuild extends PomBuild { }, publishMavenStyle in MavenCompile := true, publishLocal in MavenCompile <<= publishTask(publishLocalConfiguration in MavenCompile, deliverLocal), - publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn + publishLocalBoth <<= Seq(publishLocal in MavenCompile, publishLocal).dependOn, + + javacOptions in (Compile, doc) ++= { + val Array(major, minor, _) = System.getProperty("java.version").split("\\.", 3) + if (major.toInt >= 1 && minor.toInt >= 8) Seq("-Xdoclint:all", "-Xdoclint:-missing") else Seq.empty + } ) def enable(settings: Seq[Setting[_]])(projectRef: ProjectRef) = { |