diff --git a/android/guava/javadoc-link/checker-framework/package-list b/android/guava/javadoc-link/checker-framework/package-list
new file mode 100644
index 000000000000..ce4e9fb098e0
--- /dev/null
+++ b/android/guava/javadoc-link/checker-framework/package-list
@@ -0,0 +1,101 @@
+android.annotation
+android.support.annotation
+com.sun.istack.internal
+edu.umd.cs.findbugs.annotations
+javax.annotation
+javax.annotation.concurrent
+javax.annotation.meta
+javax.validation.constraints
+lombok
+net.jcip.annotations
+org.checkerframework.checker.compilermsgs
+org.checkerframework.checker.compilermsgs.qual
+org.checkerframework.checker.fenum
+org.checkerframework.checker.fenum.qual
+org.checkerframework.checker.formatter
+org.checkerframework.checker.formatter.qual
+org.checkerframework.checker.guieffect
+org.checkerframework.checker.guieffect.qual
+org.checkerframework.checker.i18n
+org.checkerframework.checker.i18n.qual
+org.checkerframework.checker.i18nformatter
+org.checkerframework.checker.i18nformatter.qual
+org.checkerframework.checker.i18nformatter.unittests
+org.checkerframework.checker.index
+org.checkerframework.checker.index.lowerbound
+org.checkerframework.checker.index.qual
+org.checkerframework.checker.index.samelen
+org.checkerframework.checker.index.searchindex
+org.checkerframework.checker.index.substringindex
+org.checkerframework.checker.index.upperbound
+org.checkerframework.checker.initialization
+org.checkerframework.checker.initialization.qual
+org.checkerframework.checker.interning
+org.checkerframework.checker.interning.qual
+org.checkerframework.checker.linear
+org.checkerframework.checker.linear.qual
+org.checkerframework.checker.lock
+org.checkerframework.checker.lock.qual
+org.checkerframework.checker.nullness
+org.checkerframework.checker.nullness.compatqual
+org.checkerframework.checker.nullness.qual
+org.checkerframework.checker.propkey
+org.checkerframework.checker.propkey.qual
+org.checkerframework.checker.regex
+org.checkerframework.checker.regex.qual
+org.checkerframework.checker.signature
+org.checkerframework.checker.signature.qual
+org.checkerframework.checker.signedness
+org.checkerframework.checker.signedness.qual
+org.checkerframework.checker.tainting
+org.checkerframework.checker.tainting.qual
+org.checkerframework.checker.units
+org.checkerframework.checker.units.qual
+org.checkerframework.common.aliasing
+org.checkerframework.common.aliasing.qual
+org.checkerframework.common.basetype
+org.checkerframework.common.reflection
+org.checkerframework.common.reflection.qual
+org.checkerframework.common.subtyping
+org.checkerframework.common.util
+org.checkerframework.common.util.count
+org.checkerframework.common.util.debug
+org.checkerframework.common.util.report
+org.checkerframework.common.util.report.qual
+org.checkerframework.common.value
+org.checkerframework.common.value.qual
+org.checkerframework.common.value.util
+org.checkerframework.common.wholeprograminference
+org.checkerframework.dataflow.analysis
+org.checkerframework.dataflow.cfg
+org.checkerframework.dataflow.cfg.block
+org.checkerframework.dataflow.cfg.node
+org.checkerframework.dataflow.cfg.playground
+org.checkerframework.dataflow.constantpropagation
+org.checkerframework.dataflow.qual
+org.checkerframework.dataflow.util
+org.checkerframework.framework.flow
+org.checkerframework.framework.qual
+org.checkerframework.framework.source
+org.checkerframework.framework.test
+org.checkerframework.framework.test.diagnostics
+org.checkerframework.framework.type
+org.checkerframework.framework.type.treeannotator
+org.checkerframework.framework.type.typeannotator
+org.checkerframework.framework.type.visitor
+org.checkerframework.framework.util
+org.checkerframework.framework.util.defaults
+org.checkerframework.framework.util.dependenttypes
+org.checkerframework.framework.util.element
+org.checkerframework.framework.util.typeinference
+org.checkerframework.framework.util.typeinference.constraint
+org.checkerframework.framework.util.typeinference.solver
+org.checkerframework.javacutil
+org.checkerframework.javacutil.dist
+org.checkerframework.javacutil.trees
+org.eclipse.jdt.annotation
+org.eclipse.jgit.annotations
+org.jetbrains.annotations
+org.jmlspecs.annotation
+org.netbeans.api.annotations.common
+org.springframework.lang
diff --git a/android/guava/pom.xml b/android/guava/pom.xml
index eefa1ad04eee..379b10184027 100644
--- a/android/guava/pom.xml
+++ b/android/guava/pom.xml
@@ -108,16 +108,19 @@
org.apache.maven.plugins
maven-javadoc-plugin
- UTF-8
- UTF-8
- UTF-8
- -XDignore.symbol.file
- -Xdoclint:-html
+
+
+
+ ${project.build.sourceDirectory}:${project.build.directory}/jdk-sources
+
+ com.google.common
com.google.common.base.internal
- true
+
+
false
+
https://static.javadoc.io/com.google.code.findbugs/jsr305/3.0.1/
${project.basedir}/javadoc-link/jsr305
@@ -131,15 +134,15 @@
https://docs.oracle.com/javase/9/docs/api/
https://docs.oracle.com/javase/9/docs/api/
+
+
+ https://checkerframework.org/api/
+ ${project.basedir}/javadoc-link/checker-framework
+
http://errorprone.info/api/latest/
- https://checkerframework.org/api/
-
-
- ${project.build.sourceDirectory}:${project.build.directory}/jdk-sources
- com.google.common
diff --git a/android/pom.xml b/android/pom.xml
index 640b506ba3fe..3de6102eb910 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -152,6 +152,12 @@
true
-Xdoclint:-html
+ UTF-8
+ UTF-8
+ UTF-8
+ -XDignore.symbol.file
+ -Xdoclint:-html
+ true
diff --git a/guava/javadoc-link/checker-framework/package-list b/guava/javadoc-link/checker-framework/package-list
new file mode 100644
index 000000000000..ce4e9fb098e0
--- /dev/null
+++ b/guava/javadoc-link/checker-framework/package-list
@@ -0,0 +1,101 @@
+android.annotation
+android.support.annotation
+com.sun.istack.internal
+edu.umd.cs.findbugs.annotations
+javax.annotation
+javax.annotation.concurrent
+javax.annotation.meta
+javax.validation.constraints
+lombok
+net.jcip.annotations
+org.checkerframework.checker.compilermsgs
+org.checkerframework.checker.compilermsgs.qual
+org.checkerframework.checker.fenum
+org.checkerframework.checker.fenum.qual
+org.checkerframework.checker.formatter
+org.checkerframework.checker.formatter.qual
+org.checkerframework.checker.guieffect
+org.checkerframework.checker.guieffect.qual
+org.checkerframework.checker.i18n
+org.checkerframework.checker.i18n.qual
+org.checkerframework.checker.i18nformatter
+org.checkerframework.checker.i18nformatter.qual
+org.checkerframework.checker.i18nformatter.unittests
+org.checkerframework.checker.index
+org.checkerframework.checker.index.lowerbound
+org.checkerframework.checker.index.qual
+org.checkerframework.checker.index.samelen
+org.checkerframework.checker.index.searchindex
+org.checkerframework.checker.index.substringindex
+org.checkerframework.checker.index.upperbound
+org.checkerframework.checker.initialization
+org.checkerframework.checker.initialization.qual
+org.checkerframework.checker.interning
+org.checkerframework.checker.interning.qual
+org.checkerframework.checker.linear
+org.checkerframework.checker.linear.qual
+org.checkerframework.checker.lock
+org.checkerframework.checker.lock.qual
+org.checkerframework.checker.nullness
+org.checkerframework.checker.nullness.compatqual
+org.checkerframework.checker.nullness.qual
+org.checkerframework.checker.propkey
+org.checkerframework.checker.propkey.qual
+org.checkerframework.checker.regex
+org.checkerframework.checker.regex.qual
+org.checkerframework.checker.signature
+org.checkerframework.checker.signature.qual
+org.checkerframework.checker.signedness
+org.checkerframework.checker.signedness.qual
+org.checkerframework.checker.tainting
+org.checkerframework.checker.tainting.qual
+org.checkerframework.checker.units
+org.checkerframework.checker.units.qual
+org.checkerframework.common.aliasing
+org.checkerframework.common.aliasing.qual
+org.checkerframework.common.basetype
+org.checkerframework.common.reflection
+org.checkerframework.common.reflection.qual
+org.checkerframework.common.subtyping
+org.checkerframework.common.util
+org.checkerframework.common.util.count
+org.checkerframework.common.util.debug
+org.checkerframework.common.util.report
+org.checkerframework.common.util.report.qual
+org.checkerframework.common.value
+org.checkerframework.common.value.qual
+org.checkerframework.common.value.util
+org.checkerframework.common.wholeprograminference
+org.checkerframework.dataflow.analysis
+org.checkerframework.dataflow.cfg
+org.checkerframework.dataflow.cfg.block
+org.checkerframework.dataflow.cfg.node
+org.checkerframework.dataflow.cfg.playground
+org.checkerframework.dataflow.constantpropagation
+org.checkerframework.dataflow.qual
+org.checkerframework.dataflow.util
+org.checkerframework.framework.flow
+org.checkerframework.framework.qual
+org.checkerframework.framework.source
+org.checkerframework.framework.test
+org.checkerframework.framework.test.diagnostics
+org.checkerframework.framework.type
+org.checkerframework.framework.type.treeannotator
+org.checkerframework.framework.type.typeannotator
+org.checkerframework.framework.type.visitor
+org.checkerframework.framework.util
+org.checkerframework.framework.util.defaults
+org.checkerframework.framework.util.dependenttypes
+org.checkerframework.framework.util.element
+org.checkerframework.framework.util.typeinference
+org.checkerframework.framework.util.typeinference.constraint
+org.checkerframework.framework.util.typeinference.solver
+org.checkerframework.javacutil
+org.checkerframework.javacutil.dist
+org.checkerframework.javacutil.trees
+org.eclipse.jdt.annotation
+org.eclipse.jgit.annotations
+org.jetbrains.annotations
+org.jmlspecs.annotation
+org.netbeans.api.annotations.common
+org.springframework.lang
diff --git a/guava/pom.xml b/guava/pom.xml
index 6f2affd9974c..9e9eade42039 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -108,16 +108,19 @@
org.apache.maven.plugins
maven-javadoc-plugin
- UTF-8
- UTF-8
- UTF-8
- -XDignore.symbol.file
- -Xdoclint:-html
+
+
+
+ ${project.build.sourceDirectory}:${project.build.directory}/jdk-sources
+
+ com.google.common
com.google.common.base.internal
- true
+
+
false
+
https://static.javadoc.io/com.google.code.findbugs/jsr305/3.0.1/
${project.basedir}/javadoc-link/jsr305
@@ -131,15 +134,15 @@
https://docs.oracle.com/javase/9/docs/api/
https://docs.oracle.com/javase/9/docs/api/
+
+
+ https://checkerframework.org/api/
+ ${project.basedir}/javadoc-link/checker-framework
+
http://errorprone.info/api/latest/
- https://checkerframework.org/api/
-
-
- ${project.build.sourceDirectory}:${project.build.directory}/jdk-sources
- com.google.common
diff --git a/pom.xml b/pom.xml
index 5c3b8d17a1ab..8b79cee930ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,6 +148,12 @@
true
-Xdoclint:-html
+ UTF-8
+ UTF-8
+ UTF-8
+ -XDignore.symbol.file
+ -Xdoclint:-html
+ true