--- jsr166/build.xml	2017/01/29 20:19:00	1.231
+++ jsr166/build.xml	2017/12/24 22:17:17	1.260
@@ -18,24 +18,23 @@
   itself.  Because the JDK version matters and because different
   targets require different JDKs, we assume that users have created a
   hierarchy containing:
-  $HOME/jdk/jdk6
-  $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/jdk6
-  $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 6 7 8 9 ...
+  for $N in 8 9 10 ...
 
-  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
-  target is currently broken.
+  As of 2016-03, the sources in src/main are for jdk9+ only.
 ------------------------------------------------------------------------------
   </description>
 
@@ -134,6 +133,8 @@
   <defjdklocations v="7"/>
   <defjdklocations v="8"/>
   <defjdklocations v="9"/>
+  <defjdklocations v="10"/>
+  <defjdklocations v="11"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -143,6 +144,8 @@
   <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
   <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"/>
@@ -182,15 +185,18 @@
   <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"/>
+  <!-- The location of jdk9 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="${java8.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="java.docroot.url"   value="${java9.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 +204,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 -->
@@ -233,6 +241,11 @@
       <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
     </condition>
 
+    <local name="use-doclint"/>
+    <condition property="use-doclint">
+      <not> <equals arg1="@{target}" arg2="7"/> </not>
+    </condition>
+
     <mkdir dir="@{workdir}/tck-classes"/>
 
     <javac srcdir="@{tck.src.dir}"
@@ -252,8 +265,9 @@
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
+      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
       <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
+      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -264,12 +278,12 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
-	<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
-	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
-	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
-	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
-	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
 	<jvmarg line="@{jvmflags}"/>
 	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
 	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
@@ -291,6 +305,18 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
+  <fileset dir="${jtreg11.src.dir}">
+    <patternset id="jdk11.jtreg.tests">
+      <include name="**/*.java"/>
+    </patternset>
+  </fileset>
+
+  <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"/>
@@ -314,11 +340,12 @@
 
   <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>
 
@@ -336,16 +363,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>
@@ -362,27 +390,30 @@
   <!-- 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}}"/>
+      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
+    </sequential>
+  </macrodef>
+  <define-build-main-properties v="${build.main.java.version}"/>
 
   <target name="dists"
-          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          depends="dist, 4jdk8dist"
           description="Builds all public jars and docs"/>
+          <!--
+              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          -->
 
   <target name="compile"
           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}"/>
 
@@ -399,12 +430,13 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="-Xmodule:java.base" 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 line="--doclint-format html5"/>
+      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
       <compilerarg value="-Werror"/>
-      <compilerarg value="-Xdoclint:all/protected"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
 
@@ -448,14 +480,16 @@
              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="-Xmodule:java.base"/>
+      <arg value="-html5"/>
+      <arg value="--patch-module=java.base=${src.dir}"/>
       <arg value="-tag"/>
       <arg value="${javadoc.jls.option}"/>
 <!-- @apiNote currently unused -->
@@ -503,18 +537,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>
 
 
@@ -535,7 +565,11 @@
     <run-tck-tests
       target="${build.main.java.version}"
       workdir="${build.dir}"
-      classes="${product.jar}"/>
+      classes="${product.jar}">
+      <javac-elements>
+        <compilerarg value="-Werror"/>
+      </javac-elements>
+    </run-tck-tests>
   </target>
 
   <target name="tck-parallelism-1"
@@ -570,8 +604,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"> -->
 
@@ -582,30 +615,34 @@
 
 <!--   </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>
 
 
 
   <target name="configure-compiler">
     <fail message="ant version too old">
-      <condition>
-	<not> <antversion atleast="1.9.1"/> </not>
-      </condition>
+      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
     </fail>
 
     <property name="unchecked.option" value="-Xlint:unchecked"/>
@@ -651,12 +688,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"/>
 
@@ -668,7 +704,7 @@
            includeAntRuntime="false"
            includeJavaRuntime="false"
            encoding="ASCII"
-           executable="${javac9}"
+           executable="${build.main.javac}"
            fork="true">
 
       <include name="*.java"/>
@@ -676,9 +712,7 @@
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
-
   </target>
 
 
@@ -704,14 +738,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>
 
@@ -735,14 +767,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"/>
+      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
@@ -758,7 +788,6 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
 
@@ -774,6 +803,7 @@
         <!-- JDK9+ test classes -->
         <exclude name="*9Test.java"/>
         <exclude name="*10Test.java"/>
+        <compilerarg value="-Werror"/>
       </javac-elements>
     </run-tck-tests>
   </target>
@@ -791,8 +821,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"
@@ -808,6 +837,7 @@
              access="${build.javadoc.access}"
              sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
              classpath=""
+             source="8"
              executable="${javadoc8}"
              failonerror = "true">
       <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
@@ -835,9 +865,7 @@
 
   <target name="4jdk8clean"
           description="Removes all 4jdk8 build products">
-
     <delete dir="${build.4jdk8.dir}"/>
-
   </target>
 
 
@@ -853,13 +881,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}"
@@ -883,14 +907,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}"
@@ -914,15 +934,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>
@@ -930,14 +945,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}"
@@ -955,14 +965,13 @@
         <exclude name="SplittableRandomTest.java"/>
         <exclude name="StampedLockTest.java"/>
         <exclude name="SubmissionPublisherTest.java"/>
+        <compilerarg value="-Werror"/>
       </javac-elements>
     </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"
@@ -984,29 +993,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}"/>
 
@@ -1027,38 +1026,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}"
@@ -1075,21 +1060,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>
@@ -1097,13 +1076,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}"/>
 
@@ -1118,41 +1093,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}"
@@ -1175,15 +1136,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>
@@ -1191,13 +1147,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}"/>
 
@@ -1212,42 +1164,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}"
@@ -1270,15 +1207,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>
@@ -1286,13 +1218,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}"/>
 
@@ -1306,43 +1234,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}"
@@ -1363,13 +1278,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}"
@@ -1391,15 +1303,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>
@@ -1407,13 +1314,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}"/>
 
@@ -1427,16 +1330,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}"
@@ -1444,8 +1342,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"> -->
@@ -1466,30 +1363,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"
-          description="Puts all distributable products in single hierarchy"/>
-
+  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
 
-  <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>
 
@@ -1509,6 +1396,118 @@
     </antcall>
   </target>
 
+
+<!-- ==============================================================
+  Experimental errorprone support - http://errorprone.info
+=================================================================== -->
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
+  <target name="errorprone"
+          depends="clean, configure-compiler"
+          description="Run errorprone over jsr166 source code (experimental)">
+
+    <local name="destdir"/>
+    <property name="destdir" value="${build.classes.dir}/java.base"/>
+    <mkdir dir="${destdir}"/>
+
+    <javac srcdir="${src.dir}"
+           destdir="${destdir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           encoding="ASCII"
+           executable="${build.main.javac}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="-processorpath ${errorprone.jar}"/>
+      <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"/>
+      <compilerarg value="--patch-module=java.base=${src.dir}"/>
+      <compilerarg value="-Xprefer:source"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+      <compilerarg line="${build.args}"/>
+    </javac>
+
+    <jar destfile="${product.jar}">
+      <fileset dir="${destdir}"/>
+    </jar>
+
+    <run-tck-tests
+      target="${build.main.java.version}"
+      workdir="${build.dir}"
+      classes="${product.jar}">
+      <javac-elements>
+        <compilerarg line="-processorpath ${errorprone.jar}"/>
+        <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"/>
+        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+      </javac-elements>
+    </run-tck-tests>
+  </target>
+
+  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <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:-processorpath"/>
+        <arg value="-javacoption:${errorprone.jar}"/>
+        <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"/>
+      </jtreg-elements>
+    </run-jtreg-tests>
+  </target>
+
+
 <!-- ==============================================================
   Running guava tests against jsr166 code
 =================================================================== -->
@@ -1561,8 +1560,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"/>