| 1 |
Disable doclint by default |
| 2 |
|
| 3 |
OpenJDK 8 adds and enables doclint by default. This catches issues in |
| 4 |
javadoc comments. It is too strict, breaks javadoc compilation and, in |
| 5 |
general, breaks the build for old code known to build with previous |
| 6 |
versions of OpenJDK. |
| 7 |
|
| 8 |
See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html |
| 9 |
See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html |
| 10 |
|
| 11 |
Author: Andrew John Hughes <ahughes@redhat.com> |
| 12 |
Author: Emmanuel Bourg <ebourg@apache.org> |
| 13 |
--- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java |
| 14 |
+++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java |
| 15 |
@@ -811,10 +811,9 @@ |
| 16 |
doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt); |
| 17 |
} |
| 18 |
|
| 19 |
- if (doclintOpts.isEmpty()) { |
| 20 |
- doclintOpts.add(DocLint.XMSGS_OPTION); |
| 21 |
- } else if (doclintOpts.size() == 1 |
| 22 |
- && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none")) { |
| 23 |
+ if (doclintOpts.isEmpty() || |
| 24 |
+ (doclintOpts.size() == 1 |
| 25 |
+ && doclintOpts.get(0).equals(DocLint.XMSGS_CUSTOM_PREFIX + "none"))) { |
| 26 |
return; |
| 27 |
} |
| 28 |
|
| 29 |
--- jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java |
| 30 |
+++ jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java |
| 31 |
@@ -130,12 +130,12 @@ |
| 32 |
}; |
| 33 |
|
| 34 |
test(Collections.<String>emptyList(), |
| 35 |
- Main.Result.ERROR, |
| 36 |
- EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A)); |
| 37 |
+ Main.Result.OK, |
| 38 |
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13)); |
| 39 |
|
| 40 |
test(Arrays.asList(rawDiags), |
| 41 |
- Main.Result.ERROR, |
| 42 |
- EnumSet.of(Message.DL_ERR9, Message.DL_WRN12)); |
| 43 |
+ Main.Result.OK, |
| 44 |
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13)); |
| 45 |
|
| 46 |
test(Arrays.asList("-Xdoclint:none"), |
| 47 |
Main.Result.OK, |
| 48 |
@@ -158,8 +158,8 @@ |
| 49 |
EnumSet.of(Message.DL_WRN12)); |
| 50 |
|
| 51 |
test(Arrays.asList(rawDiags, "-private"), |
| 52 |
- Main.Result.ERROR, |
| 53 |
- EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12)); |
| 54 |
+ Main.Result.OK, |
| 55 |
+ EnumSet.of(Message.JD_WRN10, Message.JD_WRN13)); |
| 56 |
|
| 57 |
test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"), |
| 58 |
Main.Result.ERROR, |
Parent Directory
| 
Revision Log