--- jsr166/build.xml	2014/11/01 14:50:26	1.160
+++ jsr166/build.xml	2017/03/24 16:33:02	1.238
@@ -1,4 +1,6 @@
-<project name="jsr166" default="usage">
+<project name="jsr166" default="usage"
+  xmlns:if="ant:if" xmlns:unless="ant:unless"
+  xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <description>
 ------------------------------------------------------------------------------
@@ -6,6 +8,9 @@
 
   Usage: ant [target]
 
+  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
+  more details.
+
   User-specific settings are read from user.properties.
   See user.properties.sample for an explanation of some useful settings.
 
@@ -13,31 +18,34 @@
   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
   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
   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=...
-  for $N in 6 7 8 9 ...
+  ant -Djdk$N.home=... -Djdk$N.src.home=...
+  for $N in 7 8 9 10 ...
+
+  As of 2016-03, the sources in src/main are for jdk9+ only.
 ------------------------------------------------------------------------------
   </description>
 
-  <!-- Display main targets by running 'ant -projecthelp' -->
+  <!-- Run 'ant -projecthelp' (default target) -->
   <target name="usage">
     <java classname="org.apache.tools.ant.Main">
       <arg value="-projecthelp" />
     </java>
   </target>
 
+  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
 
   <!-- User-specific settings -->
   <property file="user.properties"/>
@@ -50,29 +58,22 @@
   <property name="build.deprecation"    value="false"/>
   <property name="build.javadoc.access" value="protected"/>
 
-  <!-- Tck options; see JSR166TestCase.java
-   To profile a single tck test class:
-   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
-   To stress test a single tck test class:
-   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
-  -->
-  <property name="jsr166.profileTests"     value="false"/>
-  <property name="jsr166.profileThreshold" value="100"/>
-  <property name="jsr166.runsPerTest"      value="1"/>
-  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
-
   <!-- Build locations -->
   <property name="build.dir"                   location="build"/>
   <property name="build.classes.dir"           location="${build.dir}/classes"/>
   <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
   <property name="build.loops.dir"             location="${build.dir}/loops"/>
-  <property name="build.reports.dir"           location="${build.dir}/reports"/>
 
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
   <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
   <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
 
+  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
+  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
+  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
+  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
+
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
@@ -89,21 +90,30 @@
   <macrodef name="defjdklocations">
     <attribute name="v"/>
     <sequential>
-    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
-    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
-    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
-    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
-    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
+    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
+    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
+    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
+    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
+    <local name="have.java.base"/>
+    <available property="have.java.base"
+      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
+    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
+      if:set="have.java.base"/>
+    <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"/>
     <local name="boot.jar.dir"/>
-    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
-    <path id="bootclasspath@{v}">
+    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
+    <path id="bootclasspath@{v}" unless:set="modules">
       <pathelement path="${boot.jar.dir}/resources.jar"/>
       <pathelement path="${boot.jar.dir}/rt.jar"/>
       <pathelement path="${boot.jar.dir}/jsse.jar"/>
       <pathelement path="${boot.jar.dir}/jce.jar"/>
       <pathelement path="${boot.jar.dir}/charsets.jar"/>
     </path>
-    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
+    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
     </sequential>
   </macrodef>
 
@@ -123,17 +133,23 @@
   <defjdklocations v="7"/>
   <defjdklocations v="8"/>
   <defjdklocations v="9"/>
+  <defjdklocations v="10"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="loops.src.dir"        location="${basedir}/src/loops"/>
   <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
-  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
+  <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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
   <property name="topsrc.dir"           location="${basedir}/src"/>
   <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
+  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
   <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
   <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
@@ -142,6 +158,7 @@
   <!-- Javadoc locations -->
   <property name="docs.dir"          location="${build.dir}/docs"/>
   <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
+  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
   <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
   <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
   <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
@@ -149,6 +166,7 @@
 
   <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
   <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
+  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
   <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
   <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
   <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
@@ -157,6 +175,7 @@
   <!-- Jar locations -->
   <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
   <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
+  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
   <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
   <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
   <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
@@ -168,9 +187,9 @@
   <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 2014-07 -->
+  <!-- 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/jdk9/docs"/>
+  <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}"/>
 
@@ -187,22 +206,39 @@
   <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
            classpath="${lib.dir}/jtreg.jar" />
 
-  <!-- Test classpath -->
-  <path id="test.classpath">
-    <pathelement location="${build.testcases.dir}"/>
-    <pathelement location="${junit.jar}"/>
-  </path>
-
+  <!-- Tck options; see JSR166TestCase.java
+   To profile a single tck test class:
+   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
+   To stress test a single tck test class:
+   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
+   To stress test a single tck test method:
+   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
+  -->
+  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
   <macrodef name="run-tck-tests">
     <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="target"/>
     <attribute name="compile-target" default="@{target}"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
-    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
+    <!--
+        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
+    -->
+        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
     <element name="javac-elements" optional="true"/>
+
     <sequential>
 
+    <local name="modules"/>
+    <condition property="modules">
+      <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}"
@@ -213,15 +249,18 @@
            source="@{compile-target}"
            target="@{compile-target}"
            classpath="${junit.jar}"
-           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac@{compile-target}}"
            fork="true">
 
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <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 value="--patch-module=java.base=@{classes}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -231,17 +270,24 @@
           failonerror="true"
           jvm="${java@{target}}"
           fork="true">
-	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
+	<jvmarg value="-Xbootclasspath/p:@{classes}" unless: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"/>
 
-        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
-	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
+	<syspropertyset id="system-properties-used-by-tck">
 	  <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
+	  <propertyref prefix="jsr166."/>
+	  <propertyref name="test.timeout.factor"/>
 	</syspropertyset>
 
-        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
-        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
-        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
 	<classpath>
 	  <pathelement location="${junit.jar}"/>
 	  <pathelement location="@{workdir}/tck-classes"/>
@@ -251,31 +297,62 @@
     </sequential>
   </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>
+
+  <fileset dir="${jtreg7.src.dir}">
+    <patternset id="jdk7.jtreg.tests">
+      <include name="**/*.java"/>
+    </patternset>
+  </fileset>
+
+  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
+  <property name="jtreg.flags" value=""/>
+
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
-    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
+    <!-- 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="jtregflags" default=""/>
+
     <sequential>
+
+    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
+    <property name="jtreg.verbose" value="nopass,fail,error"/>
+
+    <local name="modules"/>
+    <condition property="modules">
+      <available file="${jdk@{target}.home}/jmods" type="dir"/>
+    </condition>
+
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
-    <delete dir="@{workdir}/JTreport" quiet="true"/>
-    <mkdir dir="@{workdir}/JTwork/scratch"/>
-    <mkdir dir="@{workdir}/JTreport"/>
-    <jtreg dir="@{jtreg.src.dir}"
+    <jtreg dir="${jtreg@{target}.src.dir}"
            jdk="${jdk@{target}.home}"
-           workDir="@{workdir}/JTwork"
-           reportDir="@{workdir}/JTreport">
-
-      <arg value="-Xbootclasspath/p:@{classes}"/>
+           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="-agentvm"/>
-      <arg value="-v:nopass,fail"/>
+      <arg value="-noreport"/>
+      <arg value="-verbose:${jtreg.verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
+      <arg line="${jtreg.flags}"/>
     </jtreg>
     </sequential>
   </macrodef>
@@ -295,31 +372,46 @@
   <property name="build.main.javac" value="${javac9}"/>
 
   <target name="dists"
-          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
           description="Builds all public jars and docs"/>
 
   <target name="compile"
           depends="configure-compiler"
           description="Compiles src/main sources to build dir">
 
-    <mkdir dir="${build.classes.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"/>
+
+    <mkdir dir="${destdir}"/>
 
     <javac srcdir="${src.dir}"
-           destdir="${build.classes.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 value="--patch-module=java.base=${src.dir}" if:set="modules"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
-      <compilerarg value="-Xdoclint:all/protected"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
 
@@ -329,10 +421,15 @@
 
   <target name="jar"
           depends="compile"
-          description="Builds library jar from compiled sources">
-
+          description="Builds library jar for src/main from compiled sources">
+    <local name="subdir"/>
+    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
     <jar destfile="${product.jar}">
-      <fileset dir="${build.classes.dir}"/>
+      <fileset dir="${build.classes.dir}${subdir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
   </target>
 
@@ -346,12 +443,17 @@
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
+<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
+<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
+<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
+<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
+<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
              link="${java9.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${src.dir}:${jdk9src.dir}"
+             sourcepath="${src.dir}"
              classpath=""
              executable="${javadoc9}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
@@ -360,14 +462,21 @@
       <arg line="-Xdocrootparent ${java9.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
+      <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="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+      <arg value="implSpec:a:Implementation Requirements:"/>
       <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="implNote:a:Implementation Note:"/>
+<!-- tags added in jdk9: currently unused -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="revised:X"/> -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -391,6 +500,10 @@
       <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>
 
@@ -422,34 +535,44 @@
     <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
-
-  <target name="test-tck"
+  <target name="tck"
 	  depends="jar"
-          description="Runs tck tests for main directly">
+          description="Runs tck tests for src/main directly">
 
     <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="test-tck-parallelism-1"
-          description="Runs test-tck with given common pool parallelism">
-    <antcall target="test-tck">
+  <target name="tck-parallelism-1"
+          description="Runs tck with common pool parallelism 1">
+    <antcall target="tck">
       <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
     </antcall>
   </target>
 
-  <target name="test-tck-parallelism-0"
-          description="Runs test-tck with given common pool parallelism">
-    <antcall target="test-tck">
+  <target name="tck-parallelism-0"
+          description="Runs tck with common pool parallelism 0">
+    <antcall target="tck">
       <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
     </antcall>
   </target>
 
-  <target name="test-jtreg"
+  <target name="tck-security-manager"
+          description="Runs tck with a security manager">
+    <antcall target="tck">
+      <param name="jsr166.useSecurityManager" value="true"/>
+    </antcall>
+  </target>
+
+  <target name="jtreg"
 	  depends="jar"
-          description="Runs jtreg tests for main using the jtreg ant task">
+          description="Runs jtreg tests for src/main using the jtreg ant task">
     <run-jtreg-tests
        target="${build.main.java.version}"
        workdir="${build.dir}"
@@ -457,30 +580,42 @@
   </target>
 
   <target name="test"
-          depends="test-tck, test-tck-parallelism-1, test-jtreg"
-          description="Runs tck and jtreg tests for main">
+          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
+          description="Runs tck and jtreg tests for src/main">
   </target>
 
-  <target name="test89"
-          description="Runs tck and jtreg tests for main for multiple java versions">
+<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
 
-    <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
-    </antcall>
+<!--     <antcall target="jtreg"> -->
+<!--       <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"/>
-      <param name="build.main.javac" value="${javac9}"/>
-    </antcall>
+<!--   </target> -->
 
-  </target>
+<!--   <target name="test89" -->
+<!--           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"/> -->
+<!--       <param name="build.main.javac" value="${javac9}"/> -->
+<!--     </antcall> -->
+
+<!--   </target> -->
 
 
 
   <target name="configure-compiler">
+    <fail message="ant version too old">
+      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
+    </fail>
 
     <property name="unchecked.option" value="-Xlint:unchecked"/>
 
@@ -501,8 +636,8 @@
   <!-- Various demos and test programs -->
 
 
-  <target name="loops" depends="configure-compiler"
-          description="Benchmark from Doug Lea's AQS paper">
+  <!-- description="Benchmark from Doug Lea's AQS paper" -->
+  <target name="loops" depends="configure-compiler">
 
     <mkdir dir="${build.loops.dir}"/>
 
@@ -512,6 +647,8 @@
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
+           target="${build.sourcelevel}"
+         encoding="ASCII"
              fork="true">
 
       <compilerarg line="${build.args}"/>
@@ -527,6 +664,206 @@
   </target>
 
 
+  <target name="compile-test-loops" depends="jar"
+          description="compile all the perf tests in src/test/loops">
+
+    <mkdir dir="${build.dir}/test/loops"/>
+
+    <javac srcdir="${basedir}/src/test/loops"
+           destdir="${build.dir}/test/loops"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           encoding="ASCII"
+           executable="${javac9}"
+           fork="true">
+
+      <include name="*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+
+  </target>
+
+
+  <!-- jsr166 4jdk8 -->
+
+  <target name="4jdk8compile"
+          depends="configure-compiler"
+          description="Compiles src/jdk8 sources, targeting jdk8">
+
+    <mkdir dir="${build.4jdk8.classes.dir}"/>
+
+    <javac srcdir="${4jdk8src.dir}"
+           destdir="${build.4jdk8.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="8"
+           target="8"
+           classpath=""
+           bootclasspath="${bootclasspath8}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           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>
+
+  <target name="4jdk8doclint"
+          depends="configure-compiler"
+          description="Finds doclint warnings">
+
+    <mkdir dir="${build.4jdk8.classes.dir}"/>
+
+    <javac srcdir="${4jdk8src.dir}"
+           destdir="${build.4jdk8.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="8"
+           target="8"
+           classpath=""
+           bootclasspath="${bootclasspath8}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           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>
+
+
+  <target name="4jdk8jar"
+          depends="4jdk8compile"
+          description="Builds library jar from compiled sources">
+
+    <jar destfile="${4jdk8product.jar}">
+      <fileset dir="${build.4jdk8.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
+    </jar>
+
+  </target>
+
+
+  <target name="4jdk8-tck"
+	  depends="4jdk8jar"
+          description="Runs tck tests for jsr166-4jdk8 directly">
+
+    <run-tck-tests
+      target="8"
+      workdir="${build.4jdk8.dir}"
+      classes="${4jdk8product.jar}">
+      <javac-elements>
+        <!-- JDK9+ test classes -->
+        <exclude name="*9Test.java"/>
+        <exclude name="*10Test.java"/>
+        <compilerarg value="-Werror"/>
+      </javac-elements>
+    </run-tck-tests>
+  </target>
+
+
+  <target name="4jdk8-jtreg"
+	  depends="4jdk8jar"
+          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
+    <run-jtreg-tests
+       target="8"
+       workdir="${build.4jdk8.dir}"
+       classes="${4jdk8product.jar}"/>
+  </target>
+
+
+  <target name="4jdk8-test"
+	  depends="4jdk8-tck, 4jdk8-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk8">
+  </target>
+
+
+  <target name="4jdk8docs"
+          description="Builds javadocs for src/jdk8 to dist dir">
+
+    <delete dir="${4jdk8docs.dir}"/>
+    <mkdir dir="${4jdk8docs.dir}"/>
+
+    <javadoc destdir="${4jdk8docs.dir}"
+             packagenames="none"
+             link="${java8.api.url}"
+             overview="${4jdk8src.dir}/intro.html"
+             access="${build.javadoc.access}"
+             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
+             classpath=""
+             executable="${javadoc8}"
+             failonerror = "true">
+      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
+        <include name="**/*.java"/>
+      </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;"/>
+    </javadoc>
+  </target>
+
+
+  <target name="4jdk8dist"
+          depends="4jdk8dist-jar, 4jdk8dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+  <target name="4jdk8clean"
+          description="Removes all 4jdk8 build products">
+
+    <delete dir="${build.4jdk8.dir}"/>
+
+  </target>
+
+
+  <target name="4jdk8dist-jar"
+          depends="4jdk8clean, 4jdk8jar">
+    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
+  </target>
+
+
+  <target name="4jdk8dist-docs"
+          depends="4jdk8clean, 4jdk8docs">
+    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
+  </target>
+
+
+
   <!-- jsr166 4jdk7 -->
 
   <target name="4jdk7compile"
@@ -541,10 +878,12 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
+           target="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -552,6 +891,7 @@
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -569,10 +909,12 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
+           target="6"
            classpath=""
-           bootclasspath="${bootclasspath7}"
+           bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -593,12 +935,16 @@
 
     <jar destfile="${4jdk7product.jar}">
       <fileset dir="${build.4jdk7.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
 
 
-  <target name="4jdk7-test-tck"
+  <target name="4jdk7-tck"
 	  depends="4jdk7jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
 
@@ -610,6 +956,7 @@
         <!-- JDK8+ test classes -->
         <exclude name="*8Test.java"/>
         <exclude name="*9Test.java"/>
+        <exclude name="*10Test.java"/>
         <exclude name="DoubleAccumulatorTest.java"/>
         <exclude name="DoubleAdderTest.java"/>
         <exclude name="LongAccumulatorTest.java"/>
@@ -617,14 +964,16 @@
         <exclude name="CompletableFutureTest.java"/>
         <exclude name="SplittableRandomTest.java"/>
         <exclude name="StampedLockTest.java"/>
+        <exclude name="SubmissionPublisherTest.java"/>
+        <compilerarg value="-Werror"/>
       </javac-elements>
     </run-tck-tests>
   </target>
 
 
-  <target name="4jdk7-test-tck-junit"
-          depends="4jdk7compile"
-          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
+  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
+  <target name="4jdk7-tck-junit"
+          depends="4jdk7compile">
 
     <junit printsummary="true"
            showoutput="true"
@@ -650,19 +999,18 @@
     </junit>
   </target>
 
-  <target name="4jdk7-test-jtreg"
+  <target name="4jdk7-jtreg"
 	  depends="4jdk7jar"
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
     <run-jtreg-tests
        target="7"
        workdir="${build.4jdk7.dir}"
-       classes="${4jdk7product.jar}"
-       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
+       classes="${4jdk7product.jar}"/>
   </target>
 
 
   <target name="4jdk7-test"
-	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+	  depends="4jdk7-tck, 4jdk7-jtreg"
           description="Runs tck and jtreg tests for jsr166-4jdk7">
   </target>
 
@@ -678,9 +1026,10 @@
              link="${java7.api.url}"
              overview="${4jdk7src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
+             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
              classpath=""
-             executable="${javadoc7}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -731,14 +1080,17 @@
            classpath=""
            bootclasspath="${bootclasspath6}"
            source="5"
+           target="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           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>
@@ -751,6 +1103,10 @@
 
     <jar destfile="${jsr166x.jar}">
       <fileset dir="${build.jsr166x.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
@@ -766,10 +1122,11 @@
              packagenames="jsr166x.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              bootclasspath="${bootclasspath6}"
              source="5"
-             executable="${javadoc7}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
@@ -815,16 +1172,19 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
+           target="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
       <include name="jsr166y/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -837,6 +1197,10 @@
 
     <jar destfile="${jsr166y.jar}" index="true">
       <fileset dir="${build.jsr166y.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
@@ -852,10 +1216,11 @@
              packagenames="jsr166y.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
-             executable="${javadoc7}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
@@ -904,14 +1269,17 @@
            bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
            classpath=""
            source="6"
+           target="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
       <include name="extra166y/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -924,6 +1292,10 @@
 
     <jar destfile="${extra166y.jar}" index="true">
       <fileset dir="${build.extra166y.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
@@ -939,7 +1311,7 @@
              packagenames="extra166y.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
@@ -990,6 +1362,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="${build.jsr166e.java.version}"
+           target="${build.jsr166e.java.version}"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -999,6 +1372,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -1015,8 +1389,9 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="${build.jsr166e.java.version}"
+           target="${build.jsr166e.java.version}"
            classpath=""
-           bootclasspath="${bootclasspath7}"
+           bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac8}"
@@ -1025,6 +1400,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
 
     </javac>
@@ -1037,6 +1413,10 @@
 
     <jar destfile="${jsr166e.jar}" index="true">
       <fileset dir="${build.jsr166e.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
@@ -1052,9 +1432,10 @@
              packagenames="jsr166e.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              source="${build.jsr166e.java.version}"
-             executable="${javadoc7}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
@@ -1062,7 +1443,7 @@
   </target>
 
 
-  <target name="jsr166e-test-tck-one-java-version"
+  <target name="jsr166e-tck-one-java-version"
 	  depends="jsr166ejar">
 
     <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
@@ -1074,23 +1455,23 @@
       classes="${jsr166e.jar}"/>
   </target>
 
-  <target name="jsr166e-test-tck"
+  <target name="jsr166e-tck"
           description="Runs tck tests for jsr166e for multiple java versions">
 
 <!--     <antcall target="clean"/> -->
-<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
+<!--     <antcall target="jsr166e-tck-one-java-version"> -->
 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
 <!--     </antcall> -->
 
     <antcall target="clean"/>
-    <antcall target="jsr166e-test-tck-one-java-version">
+    <antcall target="jsr166e-tck-one-java-version">
       <param name="build.jsr166e.java.version" value="7"/>
       <param name="build.jsr166e.javac" value="${javac7}"/>
     </antcall>
 
     <antcall target="clean"/>
-    <antcall target="jsr166e-test-tck-one-java-version">
+    <antcall target="jsr166e-tck-one-java-version">
       <param name="build.jsr166e.java.version" value="6"/>
       <param name="build.jsr166e.javac" value="${javac6}"/>
     </antcall>
@@ -1098,7 +1479,7 @@
 
 
   <target name="jsr166e-test"
-	  depends="jsr166e-test-tck"
+	  depends="jsr166e-tck"
           description="Runs all tests for jsr166e">
   </target>
 
@@ -1128,9 +1509,165 @@
 
   <target name="lint">
     <antcall target="dists">
+      <param name="build.javadoc.access" value="public"/>
+    </antcall>
+  </target>
+
+<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
+  <target name="lint-private">
+    <antcall target="dist">
       <param name="build.javadoc.access" value="private"/>
     </antcall>
   </target>
 
 
+<!-- ==============================================================
+  Experimental errorprone support - http://errorprone.info
+  You may need to bring your own errorprone jar.
+=================================================================== -->
+  <target name="errorprone"
+          depends="clean, configure-compiler"
+          description="Run errorprone over jsr166 source code">
+
+    <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 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:MissingOverride:OFF
+                          -Xep:MixedArrayDimensions:WARN 
+                          -Xep:RemoveUnusedImports: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 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 line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+      </javac-elements>
+    </run-tck-tests>
+  </target>
+
+
+<!-- ==============================================================
+  Running guava tests against jsr166 code
+=================================================================== -->
+
+<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
+<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
+<!-- <property name="guava.version" value="21.0"/> -->
+
+<!-- HOWTO debug print a path id -->
+<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
+<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
+
+<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
+<!--   organisation="com.google.guava" module="guava-tests"/> -->
+<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
+<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
+<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
+<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
+
+<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
+<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
+<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
+<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
+
+<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
+<!--   type="*" inline="true" conf="*(private),*(public)" -->
+<!--   pattern="${guava.dir}/[artifact].[ext]" -->
+<!--   organisation="com.google.guava" module="guava-testlib"/> -->
+
+<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
+<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
+<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
+
+  <target name="init-ivy">
+    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
+         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
+    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
+             classpath="${build.dir}/ivy.jar"/>
+  </target>
+
+  <target name="guava-tests" depends="jar, init-ivy"
+          description="Guava tests run against jsr166 collections">
+    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
+    <mkdir dir="${guava.dir}"/>
+    <ivy:retrieve pathid="guava.testlib.classpath"
+      type="jar,bundle" inline="true" conf="default,master"
+      pattern="${guava.dir}/[artifact].[ext]"
+      organisation="com.google.guava" module="guava-testlib"/>
+    <property name="guava.version" value="21.0"/>
+    <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}"/>
+      <formatter type="brief"/>
+      <classpath>
+        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
+        <path refid="guava.testlib.classpath"/>
+      </classpath>
+
+      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
+      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
+    </junit>
+  </target>
+
 </project>