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:15 -0500 |
| commit | e464f0ac2d7210a4bf715478885fe7a8d397fe89 (patch) | |
| tree | a7dd47931f952fd203c67f8282c9bfccd7451c6d /project | |
| parent | 53ed7f1c7f8534d0d7856d83e3b46e36d09659d2 (diff) | |
| download | spark-e464f0ac2d7210a4bf715478885fe7a8d397fe89.tar.gz spark-e464f0ac2d7210a4bf715478885fe7a8d397fe89.tar.bz2 spark-e464f0ac2d7210a4bf715478885fe7a8d397fe89.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.
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 9db81df589..b16ed66aeb 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) = { |