--- jsr166/build.xml	2017/10/31 17:47:57	1.258
+++ jsr166/build.xml	2019/06/14 20:10:53	1.299
@@ -1,5 +1,6 @@
 <project name="jsr166" default="usage"
-  xmlns:if="ant:if" xmlns:unless="ant:unless"
+  xmlns:if="ant:if"
+  xmlns:unless="ant:unless"
   xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <description>
@@ -21,16 +22,24 @@
   $HOME/jdk/jdk8
   $HOME/jdk/jdk9
   $HOME/jdk/jdk10
+  $HOME/jdk/jdk11
+  $HOME/jdk/jdk12
+  $HOME/jdk/jdk13
+  $HOME/jdk/jdk14
   where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9
   $HOME/jdk/src/jdk10
+  $HOME/jdk/src/jdk11
+  $HOME/jdk/src/jdk12
+  $HOME/jdk/src/jdk13
+  $HOME/jdk/src/jdk14
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
 
   Alternatively, define ant variables thus:
   ant -Djdk$N.home=... -Djdk$N.src.home=...
-  for $N in 8 9 10 ...
+  for $N in 8 .. 14 ...
 
   As of 2016-03, the sources in src/main are for jdk9+ only.
 ------------------------------------------------------------------------------
@@ -50,7 +59,6 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -101,7 +109,7 @@
     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
       unless:set="have.java.base"/>
     <local name="modules"/>
-    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
+    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
     <local name="boot.jar.dir"/>
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
     <path id="bootclasspath@{v}" unless:set="modules">
@@ -132,6 +140,10 @@
   <defjdklocations v="8"/>
   <defjdklocations v="9"/>
   <defjdklocations v="10"/>
+  <defjdklocations v="11"/>
+  <defjdklocations v="12"/>
+  <defjdklocations v="13"/>
+  <defjdklocations v="14"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -142,6 +154,10 @@
   <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
   <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
@@ -187,10 +203,18 @@
   <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"/>
+  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
+  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/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="java.docroot.url"   value="${java9.docroot.url}"/>
+  <!-- <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="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
+  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
+  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
+  <!-- Default jdk doc location (latest stable LTS release seems best) -->
+  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -198,6 +222,11 @@
   <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
   <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
   <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
+  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
+  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
+  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
+  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
+  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -230,7 +259,7 @@
 
     <local name="modules"/>
     <condition property="modules">
-      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
+      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
     </condition>
 
     <local name="use-doclint"/>
@@ -297,35 +326,34 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
-  <fileset dir="${jtreg10.src.dir}">
-    <patternset id="jdk10.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg9.src.dir}">
-    <patternset id="jdk9.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
+  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
+  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
+  <property name="jtreg.test.pattern" value="**/*.java"/>
+  <macrodef name="defjtregtests">
+    <attribute name="v"/>
+    <sequential>
+      <fileset dir="${jtreg@{v}.src.dir}">
+        <patternset id="jdk@{v}.jtreg.tests">
+          <include name="${jtreg.test.pattern}"/>
+        </patternset>
+      </fileset>
+    </sequential>
+  </macrodef>
 
-  <fileset dir="${jtreg8.src.dir}">
-    <patternset id="jdk8.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg7.src.dir}">
-    <patternset id="jdk7.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
+  <defjtregtests v="14"/>
+  <defjtregtests v="13"/>
+  <defjtregtests v="12"/>
+  <defjtregtests v="11"/>
+  <defjtregtests v="10"/>
+  <defjtregtests v="9"/>
+  <defjtregtests v="8"/>
+  <defjtregtests v="7"/>
 
   <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
   <property name="jtreg.flags" value=""/>
 
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
+    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
@@ -340,7 +368,7 @@
 
     <local name="modules"/>
     <condition property="modules">
-      <available file="${jdk@{target}.home}/jmods" type="dir"/>
+      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
     </condition>
 
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
@@ -375,24 +403,25 @@
 
   <!-- Main targets -->
 
-  <property name="build.main.java.version" value="9"/>
-  <!-- Workaround "no nested properties in ant" -->
-  <macrodef name="define-build-main-properties">
-    <attribute name="v"/>
-    <sequential>
-      <property name="build.main.java"    value="${java@{v}}"/>
-      <property name="build.main.javac"   value="${javac@{v}}"/>
-      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
-    </sequential>
-  </macrodef>
-  <define-build-main-properties v="${build.main.java.version}"/>
+  <!-- Default values: may seem strange ... -->
+  <!-- At runtime, target latest LTS, i.e. jdk11 -->
+  <!-- But at build time, target jdk9, for maximal binary portability -->
+  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
+    o override-methods=summary
+    o {@systemProperty ...}
+    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
+    o 8202628: javadoc generates bad links in TestModules.java
+    -->
+  <property name="java.runtime.target" value="11"/>
+  <property name="build.main.java" value="${java11}"/>
+  <property name="build.main.javac" value="${javac9}"/>
+  <property name="build.main.javadoc" value="${javadoc12}"/>
+  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
 
   <target name="dists"
           depends="dist, 4jdk8dist"
           description="Builds all public jars and docs"/>
-          <!--
-              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
-          -->
+          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
 
   <target name="compile"
           depends="configure-compiler"
@@ -419,9 +448,10 @@
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Xlint:all,-removal"/>
       <compilerarg line="--doclint-format html5"/>
       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+      <compilerarg value="-Xdoclint/package:java.util.*"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
@@ -461,35 +491,33 @@
 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${java9.api.url}"
+             link="${java.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${src.dir}"
              classpath=""
-             source="9"
+             source="${build.main.javadoc.source}"
              executable="${build.main.javadoc}">
+<!-- TODO: JDK-8214571 failonerror = "true" -->
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
-      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-html5"/>
       <arg value="--patch-module=java.base=${src.dir}"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
-<!-- @apiNote currently unused -->
-<!--       <arg value="-tag"/> -->
-<!--       <arg value="apiNote:a:API Note:"/> -->
-      <arg value="-tag"/>
-      <arg value="implSpec:a:Implementation Requirements:"/>
-      <arg value="-tag"/>
-      <arg value="implNote:a:Implementation Note:"/>
+<!-- old school frames via docs/index.html?overview-summary.html -->
+<!-- TODO: - -frames no longer a supported option in jdk13+ -->
+      <arg value="--frames"/>
+      <arg value="--override-methods=summary"/>
+      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
+      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
+      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
 <!-- tags added in jdk9: currently unused -->
-<!--       <arg value="-tag"/> -->
-<!--       <arg value="revised:X"/> -->
-<!--       <arg value="-tag"/> -->
-<!--       <arg value="spec:X"/> -->
+<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
+<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -499,28 +527,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-  <target name="release"
-          depends="dist"
-          description="Puts entire CVS tree, plus distribution productions, in a jar">
-
-    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
-
-    <jar basedir="${basedir}" destfile="${release.jar}">
-      <!-- <exclude name="build/**"/> -->
-      <exclude name="${release.jar}"/>
-      <exclude name="user.properties"/>
-      <exclude name="etc/notes/**"/>
-      <exclude name="src/emulation/**"/>
-      <exclude name="**/SyntaxTest.java"/>
-      <exclude name="**/SuperfluousAbstract.java"/>
-      <manifest>
-        <attribute name="Built-By" value="${user.name}"/>
-        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
-      </manifest>
-    </jar>
-  </target>
-
-
   <target name="clean"
           description="Removes all build products">
     <delete dir="${build.dir}"/>
@@ -549,7 +555,7 @@
           description="Runs tck tests for src/main directly">
 
     <run-tck-tests
-      target="${build.main.java.version}"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
@@ -583,7 +589,7 @@
 	  depends="jar"
           description="Runs jtreg tests for src/main using the jtreg ant task">
     <run-jtreg-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}"/>
   </target>
@@ -592,33 +598,129 @@
           depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
           description="Runs tck and jtreg tests for src/main"/>
 
-<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
+  <target name="test-version-permutations"
+	  depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
+  </target>
 
-<!--     <antcall target="jtreg"> -->
-<!--       <param name="build.main.java.version" value="8"/> -->
-<!--       <param name="build.main.javac" value="${javac8}"/> -->
-<!--     </antcall> -->
+  <target name="test9">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="9"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
-<!--   </target> -->
+  <target name="test10">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="10"/>
+      <param name="build.main.javac" value="${javac10}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="10"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
+
+  <target name="test11">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="11"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
-  <target name="test910"
-          description="Runs tck and jtreg tests for src/main for multiple java versions">
+  <target name="test12">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
+      <param name="build.main.javac" value="${javac12}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="12"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
+  <target name="test13">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="9"/>
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac13}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="13"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test14">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="10"/>
+    <antcall>
+      <param name="java.runtime.target" value="14"/>
+      <param name="build.main.javac" value="${javac14}"/>
+      <param name="build.main.javadoc" value="${javadoc14}"/>
+      <param name="build.main.javadoc.source" value="14"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
-    <!-- Clean up to avoid obscure wrong class file version bugs -->
+  <target name="test9-11">
     <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="11"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
+  <target name="test9-12">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
+  <target name="test9-13">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
+
+  <target name="test9-14">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="14"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc14}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
 
   <target name="configure-compiler">
@@ -641,37 +743,6 @@
   </target>
 
 
-
-  <!-- Various demos and test programs -->
-
-
-  <!-- description="Benchmark from Doug Lea's AQS paper" -->
-  <target name="loops" depends="configure-compiler">
-
-    <mkdir dir="${build.loops.dir}"/>
-
-    <javac srcdir="${loops.src.dir}"
-          destdir="${build.loops.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-           target="${build.sourcelevel}"
-         encoding="ASCII"
-             fork="true">
-
-      <compilerarg line="${build.args}"/>
-      <classpath refid="loops.classpath"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-
-    </javac>
-
-    <java classname="ALoops" fork="true">
-      <classpath refid="loops.classpath"/>
-    </java>
-  </target>
-
-
   <target name="compile-test-loops" depends="jar"
           description="Compiles all the perf tests in src/test/loops">
 
@@ -826,15 +897,11 @@
       </fileset>
       <arg line="-Xdocrootparent ${java8.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
-<!-- @apiNote currently unused -->
-<!--       <arg value="-tag"/> -->
-<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
-      <arg value="-tag"/>
-      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
-      <arg value="-tag"/>
-      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
+      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+<!-- @apiNote tag currently unused -->
+<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
     </javadoc>
   </target>
 
@@ -1364,14 +1431,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>
@@ -1379,9 +1446,42 @@
 
 
 <!-- ==============================================================
-  Experimental errorprone support - http://errorprone.info
+  Experimental errorprone support
+  https://errorprone.info
+  https://errorprone.info/docs/installation
+  https://github.com/google/error-prone/issues/1143
 =================================================================== -->
-  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
+  <path id="errorprone.processorpath.path">
+    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
+    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
+  </path>
+  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
+  <property name="errorprone.jsr166.user.flags" value=""/>
+  <property name="errorprone.jsr166.flags"
+            value="-Xep:HashtableContains:OFF
+                   -Xep:JdkObsolete:OFF
+                   -Xep:MissingOverride:OFF
+                   -Xep:MissingFail:OFF
+                   -Xep:ThreadPriorityCheck:OFF
+                   -Xep:MixedArrayDimensions:ERROR
+                   -Xep:RemoveUnusedImports:ERROR
+                   -Xep:EmptyIf:ERROR
+                   -Xep:MultipleTopLevelClasses:ERROR
+                   -Xep:ClassName:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:IdentityBinaryExpression:WARN
+                   -Xep:ConstructorInvokesOverridable:WARN
+                   -Xep:MethodCanBeStatic:WARN
+                   ${errorprone.jsr166.user.flags}"/>
+  <!-- -Xep:WildcardImport:ERROR -->
+  <property name="errorprone.jsr166.test.flags"
+            value="-Xep:StringSplitter:OFF
+                   -Xep:BoxedPrimitiveConstructor:OFF
+                   -Xep:ModifyingCollectionWithItself:OFF"/>
+  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
   <target name="errorprone"
           depends="clean, configure-compiler"
           description="Run errorprone over jsr166 source code (experimental)">
@@ -1403,18 +1503,13 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="-processorpath ${errorprone.jar}"/>
+      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+      <compilerarg value="-J--illegal-access=permit"/>
+      <compilerarg value="-XDcompilePolicy=simple"/>
+      <compilerarg value="-processorpath"/>
+      <compilerarg pathref="errorprone.processorpath.path"/>
       <compilerarg value="-Xplugin:ErrorProne
-                          -Xep:IdentityBinaryExpression:WARN
-                          -Xep:MissingOverride:OFF
-                          -Xep:MixedArrayDimensions:ERROR
-                          -Xep:RemoveUnusedImports:ERROR
-                          -Xep:ClassName:ERROR
-                          -Xep:MultipleTopLevelClasses:ERROR
-                          -Xep:EmptyIf:ERROR
-                          -Xep:LongLiteralLowerCaseSuffix:ERROR
-                          -Xep:RedundantThrows:ERROR
-                          -Xep:MethodCanBeStatic:WARN"/>
+                          ${errorprone.jsr166.flags}"/>
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
@@ -1429,61 +1524,42 @@
     </jar>
 
     <run-tck-tests
-      target="${build.main.java.version}"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
-        <compilerarg line="-processorpath ${errorprone.jar}"/>
+        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+        <compilerarg value="-J--illegal-access=permit"/>
+        <compilerarg value="-XDcompilePolicy=simple"/>
+        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
         <compilerarg value="-Xplugin:ErrorProne
-                            -Xep:IdentityBinaryExpression:WARN
-                            -Xep:BoxedPrimitiveConstructor:OFF
-                            -Xep:HashtableContains:OFF
-                            -Xep:ModifyingCollectionWithItself:OFF
-                            -Xep:MissingOverride:OFF
-                            -Xep:MissingFail:OFF
-                            -Xep:JdkObsolete:OFF
-                            -Xep:MixedArrayDimensions:ERROR
-                            -Xep:RemoveUnusedImports:ERROR
-                            -Xep:ClassName:ERROR
-                            -Xep:MultipleTopLevelClasses:ERROR
-                            -Xep:EmptyIf:ERROR
-                            -Xep:LongLiteralLowerCaseSuffix:ERROR
-                            -Xep:RedundantThrows:ERROR
-                            -Xep:MethodCanBeStatic:WARN"/>
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}"/>
         <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
       </javac-elements>
     </run-tck-tests>
   </target>
 
-  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
   <target name="errorprone-jtreg"
           depends="jar"
           description="Run errorprone over jtreg tests (experimental)">
 
     <run-jtreg-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}"
        verbose="all">
       <jtreg-elements>
+        <arg value="-javacoption:-XDcompilePolicy=simple"/>
         <arg value="-javacoption:-processorpath"/>
-        <arg value="-javacoption:${errorprone.jar}"/>
+        <arg value="-javacoption:${errorprone.processorpath}"/>
         <arg value="-javacoption:-Xplugin:ErrorProne
-                            -Xep:IdentityBinaryExpression:WARN
-                            -Xep:BoxedPrimitiveConstructor:OFF
-                            -Xep:HashtableContains:OFF
-                            -Xep:ModifyingCollectionWithItself:OFF
-                            -Xep:MissingOverride:OFF
-                            -Xep:JdkObsolete:OFF
-                            -Xep:NonAtomicVolatileUpdate:OFF
-                            -Xep:MixedArrayDimensions:ERROR
-                            -Xep:RemoveUnusedImports:ERROR
-                            -Xep:ClassName:ERROR
-                            -Xep:MultipleTopLevelClasses:ERROR
-                            -Xep:EmptyIf:ERROR
-                            -Xep:LongLiteralLowerCaseSuffix:ERROR
-                            -Xep:RedundantThrows:ERROR
-                            -Xep:MethodCanBeStatic:WARN"/>
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}
+                            -Xep:MultipleTopLevelClasses:WARN
+                            -Xep:NonAtomicVolatileUpdate:OFF"/>
       </jtreg-elements>
     </run-jtreg-tests>
   </target>