From 849c62b8701d285d482a9d1aaec8d776defe75fe Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 11 Apr 2016 17:10:17 -0400 Subject: [PATCH] Disables doclint in Java 8 to prevent build error from javadoc task. Fixes gh-3767 --- docs/docs.gradle | 5 +++++ gradle/javaprojects.gradle | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/docs/docs.gradle b/docs/docs.gradle index e420c4abf3..4bd90af048 100644 --- a/docs/docs.gradle +++ b/docs/docs.gradle @@ -99,6 +99,11 @@ task apidocs(type: Javadoc) { } } +if (JavaVersion.current().isJava8Compatible()) { + // Turn off doclint in JDK 8 Javadoc (too strict on checks) + apidocs.options.addStringOption('Xdoclint:none', '-quiet') +} + ext.apiSpec = copySpec { into('apidocs') { from(apidocs.destinationDir) diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 1a3c4ac97c..435583f63e 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -219,6 +219,13 @@ javadoc { } } +if (JavaVersion.current().isJava8Compatible()) { + tasks.withType(Javadoc) { + // Turn off doclint in JDK 8 Javadoc (too strict on checks) + options.addStringOption('Xdoclint:none', '-quiet') + } +} + task javadocJar(type: Jar) { classifier = 'javadoc' from javadoc