--- jsr166/build.xml	2018/02/20 22:17:16	1.266
+++ jsr166/build.xml	2018/05/08 19:46:11	1.270
@@ -192,12 +192,13 @@
   <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
   <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
-  <!-- The location of jdk9 early access docs (RIP) -->
+  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
+  <!-- The location of jdk early access docs (RIP) -->
   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
-  <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
+  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
   <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
-  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
+  <!-- Default jdk doc location (latest stable release seems best) -->
+  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -390,7 +391,7 @@
       <!-- Force javadoc version to be at least 10, 
            so we can use override-methods=summary -->
       <condition property="build.main.javadoc" 
-                 value="${javadoc10}"
+                 value="${javadoc11}"
                  else="${javadoc@{v}}">
         <equals arg1="@{v}" arg2="9"/>
       </condition>
@@ -1371,14 +1372,14 @@
 
 <!-- Find buglets that can be detected by static build tools -->
 
-  <target name="lint">
-    <antcall target="dists">
-      <param name="build.javadoc.access" value="public"/>
-    </antcall>
-  </target>
+<!--   <target name="lint"> -->
+<!--     <antcall target="dists"> -->
+<!--       <param name="build.javadoc.access" value="protected"/> -->
+<!--     </antcall> -->
+<!--   </target> -->
 
 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
-  <target name="lint-private">
+  <target name="doclint-private">
     <antcall target="dist">
       <param name="build.javadoc.access" value="private"/>
     </antcall>
@@ -1388,7 +1389,8 @@
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
 =================================================================== -->
-  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
+  <property name="errorprone.jsr166.user.flags" value=""/>
   <property name="errorprone.jsr166.flags"
             value="-Xep:HashtableContains:OFF
                    -Xep:JdkObsolete:OFF
@@ -1402,7 +1404,8 @@
                    -Xep:LongLiteralLowerCaseSuffix:ERROR
                    -Xep:RedundantThrows:ERROR
                    -Xep:IdentityBinaryExpression:WARN
-                   -Xep:MethodCanBeStatic:WARN"/>
+                   -Xep:MethodCanBeStatic:WARN
+                   ${errorprone.jsr166.user.flags}"/>
   <!-- -Xep:WildcardImport:ERROR -->
   <property name="errorprone.jsr166.test.flags"
             value="-Xep:StringSplitter:OFF
@@ -1452,6 +1455,7 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
+        <compilerarg value="-J--illegal-access=debug"/>
         <compilerarg value="-XDcompilePolicy=simple"/>
         <compilerarg line="-processorpath ${errorprone.jar}"/>
         <compilerarg value="-Xplugin:ErrorProne
@@ -1480,6 +1484,7 @@
         <arg value="-javacoption:-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
                             ${errorprone.jsr166.test.flags}
+                            -Xep:MultipleTopLevelClasses:WARN
                             -Xep:NonAtomicVolatileUpdate:OFF"/>
       </jtreg-elements>
     </run-jtreg-tests>