--- jsr166/build.xml	2020/03/17 18:41:00	1.312
+++ jsr166/build.xml	2020/06/05 00:59:33	1.315
@@ -352,7 +352,11 @@
 <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
       <compilerarg value="-Xlint:all,-removal"/>
       <compilerarg line="--doclint-format html5"/>
-      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+<!--  Temporarily disable doclint for private elements, due to -->
+<!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
+<!--  which is expected to be fixed in openjdk 11.0.8 -->
+<!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
+      <compilerarg value="-Xdoclint:all/protected"/>
       <compilerarg value="-Xdoclint/package:java.util.*"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
@@ -409,7 +413,7 @@
              executable="${build.main.javadoc}">
 <!-- TODO: JDK-8214571 failonerror = "true" -->
       <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="**/*.java"/>
+        <include name="java/**/*.java"/>
       </fileset>
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>