--- jsr166/build.xml	2017/03/26 22:25:20	1.240
+++ jsr166/build.xml	2018/03/21 20:19:24	1.268
@@ -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>
@@ -18,21 +19,21 @@
   itself.  Because the JDK version matters and because different
   targets require different JDKs, we assume that users have created a
   hierarchy containing:
-  $HOME/jdk/jdk7
   $HOME/jdk/jdk8
   $HOME/jdk/jdk9
   $HOME/jdk/jdk10
+  $HOME/jdk/jdk11
   where each of the above is a JDK or a symlink to same, and
-  $HOME/jdk/src/jdk7
   $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9
   $HOME/jdk/src/jdk10
+  $HOME/jdk/src/jdk11
   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 7 8 9 10 ...
+  for $N in 8 9 10 ...
 
   As of 2016-03, the sources in src/main are for jdk9+ only.
 ------------------------------------------------------------------------------
@@ -134,6 +135,7 @@
   <defjdklocations v="8"/>
   <defjdklocations v="9"/>
   <defjdklocations v="10"/>
+  <defjdklocations v="11"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -144,6 +146,7 @@
   <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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
@@ -183,15 +186,19 @@
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
-  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
-  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
-  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
-  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
-  <!-- The expected canonical location does not yet exist as of 2016-04 -->
-  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
-  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
+  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
+  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
+  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
+  <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"/>
+  <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"/> -->
+  <!-- <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"/>
   <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
+  <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/"/>
@@ -199,6 +206,8 @@
   <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="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -298,34 +307,37 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
-  <fileset dir="${jtreg9.src.dir}">
-    <patternset id="jdk9.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg8.src.dir}">
-    <patternset id="jdk8.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="${jtreg7.src.dir}">
-    <patternset id="jdk7.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
+  <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 -->
-    <attribute name="source" default="7"/>
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
+    <attribute name="verbose" default="${jtreg.verbose}"/>
     <attribute name="jtregflags" default=""/>
+    <element name="jtreg-elements" optional="true"/>
 
     <sequential>
 
@@ -343,16 +355,17 @@
            workDir="@{workdir}/JTwork">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
-      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
+      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
+      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-noreport"/>
-      <arg value="-verbose:${jtreg.verbose}"/>
+      <arg value="-verbose:@{verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
       <arg line="${jtreg.flags}"/>
+      <jtreg-elements/>
     </jtreg>
     </sequential>
   </macrodef>
@@ -369,7 +382,22 @@
   <!-- Main targets -->
 
   <property name="build.main.java.version" value="9"/>
-  <property name="build.main.javac" value="${javac9}"/>
+  <!-- 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}}"/>
+      <!-- Force javadoc version to be at least 10, 
+           so we can use override-methods=summary -->
+      <condition property="build.main.javadoc" 
+                 value="${javadoc11}"
+                 else="${javadoc@{v}}">
+        <equals arg1="@{v}" arg2="9"/>
+      </condition>
+    </sequential>
+  </macrodef>
+  <define-build-main-properties v="${build.main.java.version}"/>
 
   <target name="dists"
           depends="dist, 4jdk8dist"
@@ -382,17 +410,8 @@
           depends="configure-compiler"
           description="Compiles src/main sources to build dir">
 
-    <local name="modules"/>
-    <condition property="modules">
-      <and>
-        <available file="${jdk9.home}/jmods" type="dir"/>
-        <equals arg1="9" arg2="${build.main.java.version}"/>
-      </and>
-    </condition>
-
     <local name="destdir"/>
-    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
-    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
+    <property name="destdir" value="${build.classes.dir}/java.base"/>
 
     <mkdir dir="${destdir}"/>
 
@@ -409,12 +428,13 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
+      <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
-      <compilerarg value="-Werror"/>
+      <compilerarg line="--doclint-format html5"/>
       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
 
@@ -458,28 +478,25 @@
              access="${build.javadoc.access}"
              sourcepath="${src.dir}"
              classpath=""
-             executable="${javadoc9}">
+             source="9"
+             executable="${build.main.javadoc}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
       <arg line="-Xdocrootparent ${java9.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:"/>
+      <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:"/>
+<!-- @apiNote tag currently unused -->
+<!--  <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>
 
@@ -513,18 +530,14 @@
 
   <target name="clean"
           description="Removes all build products">
-
     <delete dir="${build.dir}"/>
-
   </target>
 
 
   <target name="dist-clean"
           description="Removes all build and distribution products">
-
     <delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
-
   </target>
 
 
@@ -584,8 +597,7 @@
 
   <target name="test"
           depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
-          description="Runs tck and jtreg tests for src/main">
-  </target>
+          description="Runs tck and jtreg tests for src/main"/>
 
 <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
 
@@ -596,22 +608,28 @@
 
 <!--   </target> -->
 
-<!--   <target name="test89" -->
-<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
+  <target name="test91011"
+          description="Runs tck and jtreg tests for src/main for multiple java versions">
 
-<!--     <antcall target="clean"/> -->
-<!--     <antcall target="test"> -->
-<!--       <param name="build.main.java.version" value="8"/> -->
-<!--       <param name="build.main.javac" value="${javac8}"/> -->
-<!--     </antcall> -->
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="9"/>
+    </antcall>
 
-<!--     <antcall target="clean"/> -->
-<!--     <antcall target="test"> -->
-<!--       <param name="build.main.java.version" value="9"/> -->
-<!--       <param name="build.main.javac" value="${javac9}"/> -->
-<!--     </antcall> -->
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="10"/>
+    </antcall>
 
-<!--   </target> -->
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="11"/>
+    </antcall>
+
+    <!-- Clean up to avoid obscure wrong class file version bugs -->
+    <antcall target="clean"/>
+
+  </target>
 
 
 
@@ -663,12 +681,11 @@
     <java classname="ALoops" fork="true">
       <classpath refid="loops.classpath"/>
     </java>
-
   </target>
 
 
   <target name="compile-test-loops" depends="jar"
-          description="compile all the perf tests in src/test/loops">
+          description="Compiles all the perf tests in src/test/loops">
 
     <mkdir dir="${build.dir}/test/loops"/>
 
@@ -680,7 +697,7 @@
            includeAntRuntime="false"
            includeJavaRuntime="false"
            encoding="ASCII"
-           executable="${javac9}"
+           executable="${build.main.javac}"
            fork="true">
 
       <include name="*.java"/>
@@ -688,9 +705,7 @@
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
-
   </target>
 
 
@@ -716,14 +731,12 @@
            encoding="ASCII"
            executable="${javac8}"
            fork="true">
-
       <include name="**/*.java"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
@@ -747,14 +760,12 @@
            encoding="ASCII"
            executable="${javac8}"
            fork="true">
-
       <include name="**/*.java"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
@@ -770,7 +781,6 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
 
@@ -804,8 +814,7 @@
 
   <target name="4jdk8-test"
 	  depends="4jdk8-tck, 4jdk8-jtreg"
-          description="Runs tck and jtreg tests for jsr166-4jdk8">
-  </target>
+          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
 
 
   <target name="4jdk8docs"
@@ -821,6 +830,7 @@
              access="${build.javadoc.access}"
              sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
              classpath=""
+             source="8"
              executable="${javadoc8}"
              failonerror = "true">
       <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
@@ -828,15 +838,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>
 
@@ -848,9 +854,7 @@
 
   <target name="4jdk8clean"
           description="Removes all 4jdk8 build products">
-
     <delete dir="${build.4jdk8.dir}"/>
-
   </target>
 
 
@@ -866,13 +870,9 @@
   </target>
 
 
+  <!-- jsr166 4jdk7 (no longer maintained) -->
 
-  <!-- jsr166 4jdk7 -->
-
-  <target name="4jdk7compile"
-          depends="configure-compiler"
-          description="Compiles src/jdk7 sources, targeting jdk7">
-
+  <target name="4jdk7compile" depends="configure-compiler">
     <mkdir dir="${build.4jdk7.classes.dir}"/>
 
     <javac srcdir="${4jdk7src.dir}"
@@ -896,14 +896,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-  <target name="4jdk7doclint"
-          depends="configure-compiler"
-          description="Finds doclint warnings">
-
+  <target name="4jdk7doclint" depends="configure-compiler">
     <mkdir dir="${build.4jdk7.classes.dir}"/>
 
     <javac srcdir="${4jdk7src.dir}"
@@ -927,15 +923,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Xdoclint:all/protected"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="4jdk7jar"
-          depends="4jdk7compile"
-          description="Builds library jar from compiled sources">
-
+  <target name="4jdk7jar" depends="4jdk7compile">
     <jar destfile="${4jdk7product.jar}">
       <fileset dir="${build.4jdk7.classes.dir}"/>
       <manifest>
@@ -943,14 +934,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="4jdk7-tck"
-	  depends="4jdk7jar"
-          description="Runs tck tests for jsr166-4jdk7 directly">
-
+  <target name="4jdk7-tck" depends="4jdk7jar">
     <run-tck-tests
       target="7"
       workdir="${build.4jdk7.dir}"
@@ -973,10 +959,8 @@
     </run-tck-tests>
   </target>
 
-
   <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
-  <target name="4jdk7-tck-junit"
-          depends="4jdk7compile">
+  <target name="4jdk7-tck-junit" depends="4jdk7compile">
 
     <junit printsummary="true"
            showoutput="true"
@@ -998,29 +982,19 @@
 
       <test name="${jsr166.tckTestClass}" haltonfailure="no">
       </test>
-
     </junit>
   </target>
 
-  <target name="4jdk7-jtreg"
-	  depends="4jdk7jar"
-          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
+  <target name="4jdk7-jtreg" depends="4jdk7jar">
     <run-jtreg-tests
        target="7"
        workdir="${build.4jdk7.dir}"
        classes="${4jdk7product.jar}"/>
   </target>
 
+  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
 
-  <target name="4jdk7-test"
-	  depends="4jdk7-tck, 4jdk7-jtreg"
-          description="Runs tck and jtreg tests for jsr166-4jdk7">
-  </target>
-
-
-  <target name="4jdk7docs"
-          description="Builds javadocs for src/jdk7 to dist dir">
-
+  <target name="4jdk7docs">
     <delete dir="${4jdk7docs.dir}"/>
     <mkdir dir="${4jdk7docs.dir}"/>
 
@@ -1041,38 +1015,24 @@
     </javadoc>
   </target>
 
+  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
 
-  <target name="4jdk7dist"
-          depends="4jdk7dist-jar, 4jdk7dist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="4jdk7clean"
-          description="Removes all 4jdk7 build products">
-
+  <target name="4jdk7clean">
     <delete dir="${build.4jdk7.dir}"/>
-
   </target>
 
-
-  <target name="4jdk7dist-jar"
-          depends="4jdk7clean, 4jdk7jar">
+  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
   </target>
 
-
-  <target name="4jdk7dist-docs"
-          depends="4jdk7clean, 4jdk7docs">
+  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
     <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
   </target>
 
 
-  <!-- jsr166x -->
-
-  <target name="jsr166xcompile"
-          depends="configure-compiler"
-          description="Compiles jsr166x sources to build dir">
+  <!-- jsr166x (no longer maintained) -->
 
+  <target name="jsr166xcompile" depends="configure-compiler">
     <mkdir dir="${build.jsr166x.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1089,21 +1049,15 @@
            encoding="ASCII"
            executable="${javac7}"
            fork="true">
-
       <include name="jsr166x/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="jsr166xjar"
-          depends="jsr166xcompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="jsr166xjar" depends="jsr166xcompile">
     <jar destfile="${jsr166x.jar}">
       <fileset dir="${build.jsr166x.classes.dir}"/>
       <manifest>
@@ -1111,13 +1065,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="jsr166xdocs"
-          description="Builds javadocs to dist dir">
-
+  <target name="jsr166xdocs">
     <delete dir="${jsr166xdocs.dir}"/>
     <mkdir dir="${jsr166xdocs.dir}"/>
 
@@ -1132,41 +1082,27 @@
              failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-
     </javadoc>
   </target>
 
+  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
 
-  <target name="jsr166xdist"
-          depends="jsr166xdist-jar, jsr166xdist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="jsr166xclean"
-          description="Removes all jsr166x build products">
-
+  <target name="jsr166xclean">
     <delete dir="${build.jsr166x.dir}"/>
-
   </target>
 
-
-  <target name="jsr166xdist-jar"
-          depends="jsr166xclean, jsr166xjar">
+  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
     <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="jsr166xdist-docs"
-          depends="jsr166xclean, jsr166xdocs">
+  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
     <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
   </target>
 
-  <!-- jsr166y -->
 
+  <!-- jsr166y (no longer maintained) -->
 
-  <target name="jsr166ycompile"
-          depends="configure-compiler"
-          description="Compiles jsr166y sources">
-
+  <target name="jsr166ycompile" depends="configure-compiler">
     <mkdir dir="${build.jsr166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1189,15 +1125,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="jsr166yjar"
-          depends="jsr166ycompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="jsr166yjar" depends="jsr166ycompile">
     <jar destfile="${jsr166y.jar}" index="true">
       <fileset dir="${build.jsr166y.classes.dir}"/>
       <manifest>
@@ -1205,13 +1136,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="jsr166ydocs"
-          description="Builds javadocs to dist dir">
-
+  <target name="jsr166ydocs">
     <delete dir="${jsr166ydocs.dir}"/>
     <mkdir dir="${jsr166ydocs.dir}"/>
 
@@ -1226,42 +1153,27 @@
              failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-
     </javadoc>
   </target>
 
+  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
 
-  <target name="jsr166ydist"
-          depends="jsr166ydist-jar, jsr166ydist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="jsr166yclean"
-          description="Removes all jsr166y build products">
-
+  <target name="jsr166yclean">
     <delete dir="${build.jsr166y.dir}"/>
-
   </target>
 
-
-  <target name="jsr166ydist-jar"
-          depends="jsr166yclean, jsr166yjar">
+  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
     <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="jsr166ydist-docs"
-          depends="jsr166yclean, jsr166ydocs">
+  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
     <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
   </target>
 
 
-  <!-- extra166y -->
-
-
-  <target name="extra166ycompile"
-          depends="configure-compiler, jsr166yjar"
-          description="Compiles extra166y sources">
+  <!-- extra166y (no longer maintained) -->
 
+  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
     <mkdir dir="${build.extra166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1284,15 +1196,10 @@
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="extra166yjar"
-          depends="extra166ycompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="extra166yjar" depends="extra166ycompile">
     <jar destfile="${extra166y.jar}" index="true">
       <fileset dir="${build.extra166y.classes.dir}"/>
       <manifest>
@@ -1300,13 +1207,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="extra166ydocs"
-          description="Builds javadocs to build dir">
-
+  <target name="extra166ydocs">
     <delete dir="${extra166ydocs.dir}"/>
     <mkdir dir="${extra166ydocs.dir}"/>
 
@@ -1320,43 +1223,30 @@
              executable="${javadoc7}">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-
     </javadoc>
   </target>
 
+  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
 
-  <target name="extra166ydist"
-          depends="extra166ydist-jar, extra166ydist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="extra166yclean"
-          description="Removes all extra166y build products">
-
+  <target name="extra166yclean">
     <delete dir="${build.extra166y.dir}"/>
-
   </target>
 
-
-  <target name="extra166ydist-jar"
-          depends="extra166yclean, extra166yjar">
+  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
     <copy file="${extra166y.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="extra166ydist-docs"
-          depends="extra166yclean, extra166ydocs">
+  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
     <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
   </target>
 
-  <!-- jsr166e -->
+
+  <!-- jsr166e (no longer maintained) -->
 
   <property name="build.jsr166e.java.version" value="6"/>
   <property name="build.jsr166e.javac" value="${javac6}"/>
 
-  <target name="jsr166ecompile"
-          depends="configure-compiler"
-          description="Compiles jsr166e sources">
-
+  <target name="jsr166ecompile" depends="configure-compiler">
     <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1377,13 +1267,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-  <!-- jsr166e: find doclint errors -->
   <target name="jsr166edoclint">
-
     <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1405,15 +1292,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
-
     </javac>
   </target>
 
-
-  <target name="jsr166ejar"
-          depends="jsr166ecompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="jsr166ejar" depends="jsr166ecompile">
     <jar destfile="${jsr166e.jar}" index="true">
       <fileset dir="${build.jsr166e.classes.dir}"/>
       <manifest>
@@ -1421,13 +1303,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="jsr166edocs"
-          description="Builds javadocs to build dir">
-
+  <target name="jsr166edocs">
     <delete dir="${jsr166edocs.dir}"/>
     <mkdir dir="${jsr166edocs.dir}"/>
 
@@ -1441,16 +1319,11 @@
              failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-
     </javadoc>
   </target>
 
-
-  <target name="jsr166e-tck-one-java-version"
-	  depends="jsr166ejar">
-
+  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
     <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
-
     <run-tck-tests
       tck.src.dir="${test.src.dir}/tck-jsr166e"
       target="${build.jsr166e.java.version}"
@@ -1458,8 +1331,7 @@
       classes="${jsr166e.jar}"/>
   </target>
 
-  <target name="jsr166e-tck"
-          description="Runs tck tests for jsr166e for multiple java versions">
+  <target name="jsr166e-tck">
 
 <!--     <antcall target="clean"/> -->
 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
@@ -1480,30 +1352,20 @@
     </antcall>
   </target>
 
+  <target name="jsr166e-test" depends="jsr166e-tck"/>
 
-  <target name="jsr166e-test"
-	  depends="jsr166e-tck"
-          description="Runs all tests for jsr166e">
-  </target>
+  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
 
-  <target name="jsr166edist"
-          depends="jsr166edist-jar, jsr166edist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="jsr166eclean"
-          description="Removes all jsr166e build products">
+  <target name="jsr166eclean">
     <delete dir="${build.jsr166e.dir}"/>
   </target>
 
-
   <target name="jsr166edist-jar"
           depends="jsr166eclean, jsr166ejar">
     <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="jsr166edist-docs"
-          depends="jsr166eclean, jsr166edocs">
+  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
     <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
   </target>
 
@@ -1526,11 +1388,33 @@
 
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
-  You may need to bring your own errorprone jar.
 =================================================================== -->
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+  <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:MixedArrayDimensions:ERROR
+                   -Xep:RemoveUnusedImports:ERROR
+                   -Xep:EmptyIf:ERROR
+                   -Xep:MultipleTopLevelClasses:ERROR
+                   -Xep:ClassName:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:IdentityBinaryExpression: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">
+          description="Run errorprone over jsr166 source code (experimental)">
 
     <local name="destdir"/>
     <property name="destdir" value="${build.classes.dir}/java.base"/>
@@ -1549,22 +1433,10 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
+      <compilerarg value="-XDcompilePolicy=simple"/>
+      <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
-                          -Xep:IdentityBinaryExpression:WARN 
-                          -Xep:MissingOverride:OFF
-                          -Xep:MixedArrayDimensions:WARN 
-                          -Xep:RemoveUnusedImports: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"/>
@@ -1583,30 +1455,39 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
-        <compilerarg value="-Xplugin:ErrorProne 
-                            -Xep:IdentityBinaryExpression:WARN 
-                            -Xep:BoxedPrimitiveConstructor:OFF 
-                            -Xep:HashtableContains:OFF 
-                            -Xep:ModifyingCollectionWithItself:OFF 
-                            -Xep:MissingOverride:OFF 
-                            -Xep:MixedArrayDimensions:WARN 
-                            -Xep:RemoveUnusedImports:ERROR 
-                            -Xep:MethodCanBeStatic:WARN"/>
+        <compilerarg value="-XDcompilePolicy=simple"/>
+        <compilerarg line="-processorpath ${errorprone.jar}"/>
+        <compilerarg value="-Xplugin:ErrorProne
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}"/>
         <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
       </javac-elements>
     </run-tck-tests>
   </target>
 
+  <!-- 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}"
+       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:-Xplugin:ErrorProne
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}
+                            -Xep:NonAtomicVolatileUpdate:OFF"/>
+      </jtreg-elements>
+    </run-jtreg-tests>
+  </target>
+
 
 <!-- ==============================================================
   Running guava tests against jsr166 code
@@ -1660,8 +1541,8 @@
     <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
          dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
     <junit printsummary="true" showoutput="true" haltonfailure="true"
-           jvm="${java9}" fork="true">
-      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
+           jvm="${build.main.java}" fork="true">
+      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
       <formatter type="brief"/>
       <classpath>
         <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>