--- jsr166/build.xml	2013/07/10 17:09:45	1.143
+++ jsr166/build.xml	2020/08/12 18:01:46	1.319
@@ -1,4 +1,7 @@
-<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 +9,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,67 +19,55 @@
   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/jdk11
+  $HOME/jdk/jdk12
+  $HOME/jdk/jdk13
+  $HOME/jdk/jdk14
+  $HOME/jdk/jdk15
+  $HOME/jdk/jdk16
   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
-  where each of the above is a complete JDK source tree
-  (e.g. mercurial forest) or a symlink to same.
-As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
+  $HOME/jdk/src/jdk11
+  $HOME/jdk/src/jdk12
+  $HOME/jdk/src/jdk13
+  $HOME/jdk/src/jdk14
+  $HOME/jdk/src/jdk15
+  $HOME/jdk/src/jdk16
+  where each of the above is a JDK source tree or a symlink to same.
+
+  Alternatively, define ant variables thus:
+  ant -Djdk$N.home=... -Djdk$N.src.home=...
+  for $N in 11 .. 16 ...
+
+  As of 2016-03, the sources in src/main are for jdk9+ only.
+  As of 2019-08, the sources in src/main are for jdk11+ only.
+  As of 2019-10, compatibility support for jdk8 is dropped entirely.
 ------------------------------------------------------------------------------
   </description>
 
-  <target name="usage" 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"/>
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
   <property name="build.javadoc.access" value="protected"/>
 
-  <!-- Tck options; see JSR166TestCase.java -->
-  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
-  <property name="jsr166.profileTests"     value="false"/>
-  <property name="jsr166.profileThreshold" value="100"/>
-  <property name="jsr166.runsPerTest"      value="1"/>
-  <!-- Allow running an individual tck test class -->
-  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
-  <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.jsr166x.dir"           location="${build.dir}/jsr166x"/>
-  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
-  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
-  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
-
-  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
-  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
-  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
-  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
 
   <!-- JDK locations -->
   <property name="jdks.home"  location="${user.home}/jdk"/>
@@ -81,21 +75,12 @@ As of 2013-02, the very latest lambda 8
   <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"/>
-    <local name="boot.jar.dir"/>
-    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
-    <path id="bootclasspath@{v}">
-      <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="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}"/>
+    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
     </sequential>
   </macrodef>
 
@@ -111,80 +96,91 @@ As of 2013-02, the very latest lambda 8
     </sequential>
   </macrodef>
 
-  <defjdklocations v="6"/>
-  <defjdklocations v="7"/>
-  <defjdklocations v="8"/>
+  <defjdklocations v="11"/>
+  <defjdklocations v="12"/>
+  <defjdklocations v="13"/>
+  <defjdklocations v="14"/>
+  <defjdklocations v="15"/>
+  <defjdklocations v="16"/>
 
   <!-- 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="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg.src.dir"        location="${jtreg11.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="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
-  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
-  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
-  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
 
   <!-- Javadoc locations -->
   <property name="docs.dir"          location="${build.dir}/docs"/>
-  <property name="4jdk7docs.dir"     location="${build.4jdk7.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"/>
-  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
-
-  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
-  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
-  <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"/>
-  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
+  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
-  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.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"/>
-  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
-  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
-  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
-  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
-  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
-
-  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
-  <!-- The below does not yet exist as of 2013-01 -->
-  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
+  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
+  <!-- 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"/> -->
+  <!-- The location of jdk early access docs (RIP) -->
+  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
+  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
+  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
+  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
+  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
+  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
+  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
+  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
+  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
+  <!-- Default jdk doc location (latest stable LTS release seems best) -->
+  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
 
-  <!-- Default jdk api doc location (latest stable release seems best) -->
-  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
+  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
+  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
+  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
+  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
+  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
+  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
+  <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
+  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
   <!-- See the docs in "jtreg -onlineHelp" -->
   <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 configuration 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=""/>
+    <!--
+        <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>
 
     <mkdir dir="@{workdir}/tck-classes"/>
@@ -197,15 +193,17 @@ As of 2013-02, the very latest lambda 8
            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"/>
+      <compilerarg value="--patch-module=java.base=@{classes}"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -215,44 +213,88 @@ As of 2013-02, the very latest lambda 8
           failonerror="true"
           jvm="${java@{target}}"
           fork="true">
-	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
-	<jvmarg line="@{jvmflags}"/>
-        <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"/>
-	</classpath>
+        <jvmarg value="--patch-module=java.base=@{classes}"/>
+        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
+        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
+        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
+        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
+        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
+        <jvmarg line="@{jvmflags}"/>
+        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
+        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
+
+        <!-- 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>
+
+        <classpath>
+          <pathelement location="${junit.jar}"/>
+          <pathelement location="@{workdir}/tck-classes"/>
+        </classpath>
     </java>
 
     </sequential>
   </macrodef>
 
+  <!-- Define jtreg test sets for different jdk versions -->
+  <!-- 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>
+
+  <defjtregtests v="16"/>
+  <defjtregtests v="15"/>
+  <defjtregtests v="14"/>
+  <defjtregtests v="13"/>
+  <defjtregtests v="12"/>
+  <defjtregtests v="11"/>
+
+  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
+  <property name="jtreg.flags" value=""/>
+
   <macrodef name="run-jtreg-tests">
-    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
-    <attribute name="source" default="7"/>
+    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <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>
+
+    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
+    <property name="jtreg.verbose" value="nopass,fail,error"/>
+
     <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="-javacoptions:--patch-module=java.base=@{classes}"/>
+      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
+      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
       <arg value="-agentvm"/>
-      <arg value="-v:nopass,fail"/>
+      <arg value="-noreport"/>
+      <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>
@@ -263,36 +305,68 @@ As of 2013-02, the very latest lambda 8
   </path>
 
   <!-- Support @jls tag, used in jdk8+ javadoc -->
+  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
   <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
 
   <!-- Main targets -->
 
+  <!-- Default values: may seem strange ... -->
+  <!-- At runtime, target latest LTS, i.e. jdk11 -->
+  <!-- But at build time, target jdk9, for maximal binary portability -->
+  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
+  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
+    o override-methods=summary
+    o {@systemProperty ...}
+    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
+    o 8202628: javadoc generates bad links in TestModules.java
+    -->
+  <property name="java.runtime.target" value="11"/>
+  <property name="build.main.java" value="${java11}"/>
+  <property name="build.main.javac" value="${javac11}"/>
+  <property name="build.main.javadoc" value="${javadoc12}"/>
+  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
+
   <target name="dists"
-          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          depends="dist"
           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="destdir"/>
+    <property name="destdir" value="${build.classes.dir}/java.base"/>
+
+    <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"
-           executable="${javac8}"
+           encoding="ASCII"
+           executable="${build.main.javac}"
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all"/>
+<!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
+      <compilerarg value="-Xlint:all,-removal"/>
+      <compilerarg line="--doclint-format html5"/>
+<!--  Temporarily disable doclint for private elements, due to -->
+<!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
+<!--  which is expected to be fixed in openjdk 11.0.8 -->
+<!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
+      <compilerarg value="-Xdoclint:all/protected"/>
+      <compilerarg value="-Xdoclint/package:java.util.*"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -301,10 +375,15 @@ As of 2013-02, the very latest lambda 8
 
   <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>
 
@@ -312,32 +391,53 @@ As of 2013-02, the very latest lambda 8
   <target name="docs"
           description="Builds javadocs for src/main to dist dir">
 
-    <delete dir="${docs.dir}"/>
+    <delete dir="${docs.dir}" quiet="true"/>
     <mkdir dir="${docs.dir}"/>
 
+    <!-- old school frames via docs/index.html?overview-summary.html -->
+    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
+    <local name="use-frames"/>
+    <condition property="use-frames">
+      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
+    </condition>
+
     <!-- 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="${jdkapi8docs.url}"
+             link="${java.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${src.dir}:${jdk8src.dir}"
+             sourcepath="${src.dir}"
              classpath=""
-             executable="${javadoc8}">
+             source="${build.main.javadoc.source}"
+             executable="${build.main.javadoc}">
+<!-- TODO: JDK-8214571 failonerror = "true" -->
       <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="**/*.java"/>
+        <include name="java/**/*.java"/>
       </fileset>
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
+      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
+      <arg value="-quiet"/>
       <arg value="-XDignore.symbol.file=true"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
-      <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="-html5"/>
+      <arg value="-Xdoclint:all,-missing"/>
+      <arg value="--patch-module=java.base=${src.dir}"/>
+      <arg value="--frames" if:set="use-frames"/>
+      <arg value="--override-methods=summary"/>
+      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
+      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
+      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
+<!-- tags added in jdk9: currently unused -->
+<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
+<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -347,37 +447,16 @@ As of 2013-02, the very latest lambda 8
           description="Puts all distributable products in single hierarchy"/>
 
 
-  <target name="release"
-          depends="dist"
-          description="Puts entire CVS tree, plus distribution productions, in a jar">
-
-    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
-
-    <jar basedir="${basedir}" destfile="${release.jar}">
-      <!-- <exclude name="build/**"/> -->
-      <exclude name="${release.jar}"/>
-      <exclude name="user.properties"/>
-      <exclude name="etc/notes/**"/>
-      <exclude name="src/emulation/**"/>
-      <exclude name="**/SyntaxTest.java"/>
-      <exclude name="**/SuperfluousAbstract.java"/>
-    </jar>
-  </target>
-
-
   <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>
 
 
@@ -391,617 +470,459 @@ As of 2013-02, the very latest lambda 8
     <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
-
-  <target name="test-tck"
-	  depends="jar"
-          description="Runs tck tests for main directly">
+  <target name="tck"
+          depends="jar"
+          description="Runs tck tests for src/main directly">
 
     <run-tck-tests
-      target="8"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
-      classes="${product.jar}"/>
-  </target>
-
-  <target name="test-jtreg"
-	  depends="jar"
-          description="Runs jtreg tests for main using the jtreg ant task">
-    <run-jtreg-tests
-       target="8"
-       workdir="${build.dir}"
-       classes="${product.jar}"/>
-  </target>
-
-  <target name="test"
-          depends="test-tck, test-jtreg"
-          description="Runs tck and jtreg tests for main">
-  </target>
-
-
-
-  <target name="configure-compiler">
-
-    <property name="unchecked.option" value="-Xlint:unchecked"/>
-
-    <condition property="warnunchecked.arg" value="${unchecked.option}">
-      <istrue value="${build.warnunchecked}"/>
-    </condition>
-
-    <property name="warnunchecked.arg" value=""/>
-
-
-    <!-- Common options in javac invocations -->
-    <property name="build.args" value="${warnunchecked.arg}"/>
-
-  </target>
-
-
-
-  <!-- Various demos and test programs -->
-
-
-  <target name="loops" depends="configure-compiler"
-          description="Benchmark from Doug Lea's AQS paper">
-
-    <mkdir dir="${build.loops.dir}"/>
-
-    <javac srcdir="${loops.src.dir}"
-          destdir="${build.loops.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-
-      <compilerarg line="${build.args}"/>
-      <classpath refid="loops.classpath"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-
-    </javac>
-
-    <java classname="ALoops" fork="true">
-      <classpath refid="loops.classpath"/>
-    </java>
-
-  </target>
-
-
-  <!-- jsr166 4jdk7 -->
-
-  <target name="4jdk7compile"
-          depends="configure-compiler"
-          description="Compiles src/jdk7 sources, targeting jdk7">
-
-    <mkdir dir="${build.4jdk7.classes.dir}"/>
-
-    <javac srcdir="${4jdk7src.dir}"
-           destdir="${build.4jdk7.classes.dir}"
-           debug="${build.debug}"
-           debuglevel="${build.debuglevel}"
-           deprecation="${build.deprecation}"
-           source="6"
-           classpath=""
-           bootclasspath="${bootclasspath6}"
-           includeAntRuntime="false"
-           includeJavaRuntime="false"
-           executable="${javac7}"
-           fork="true">
-
-      <include name="**/*.java"/>
-      <compilerarg value="-Xprefer:source"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all"/>
-      <compilerarg line="${build.args}"/>
-
-    </javac>
-  </target>
-
-
-  <target name="4jdk7jar"
-          depends="4jdk7compile"
-          description="Builds library jar from compiled sources">
-
-    <jar destfile="${4jdk7product.jar}">
-      <fileset dir="${build.4jdk7.classes.dir}"/>
-    </jar>
-
-  </target>
-
-
-  <target name="4jdk7-test-tck"
-	  depends="4jdk7jar"
-          description="Runs tck tests for jsr166-4jdk7 directly">
-
-    <run-tck-tests
-      target="7"
-      workdir="${build.4jdk7.dir}"
-      classes="${4jdk7product.jar}">
+      classes="${product.jar}">
       <javac-elements>
-        <!-- JDK8+ test classes -->
-        <exclude name="*8Test.java"/>
-        <exclude name="DoubleAccumulatorTest.java"/>
-        <exclude name="DoubleAdderTest.java"/>
-        <exclude name="LongAccumulatorTest.java"/>
-        <exclude name="LongAdderTest.java"/>
-        <exclude name="CompletableFutureTest.java"/>
-        <exclude name="StampedLockTest.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)">
-
-    <junit printsummary="true"
-           showoutput="true"
-           errorProperty="junit.failed"
-           failureProperty="junit.failed"
-           includeantruntime="true"
-           jvm="${java7}"
-           fork="true">
-
-      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
-      <jvmarg value="-server"/>
-
-      <classpath>
-        <pathelement location="${junit.jar}"/>
-        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
-      </classpath>
-
-      <formatter type="brief"/>
-
-      <test name="${jsr166.tckTestClass}" haltonfailure="no">
-      </test>
-
-    </junit>
-  </target>
-
-  <target name="4jdk7-test-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"/>
+  <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="4jdk7-test"
-	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
-          description="Runs tck and jtreg tests for jsr166-4jdk7">
+  <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="4jdk7docs"
-          description="Builds javadocs for src/jdk7 to dist dir">
-
-    <delete dir="${4jdk7docs.dir}"/>
-    <mkdir dir="${4jdk7docs.dir}"/>
-
-    <javadoc destdir="${4jdk7docs.dir}"
-             packagenames="none"
-             link="${jdkapi7docs.url}"
-             overview="${4jdk7src.dir}/intro.html"
-             access="${build.javadoc.access}"
-             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
-             classpath=""
-             executable="${javadoc7}">
-      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
-        <include name="**/*.java"/>
-      </fileset>
-      <arg value="-XDignore.symbol.file=true"/>
-    </javadoc>
+  <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="4jdk7dist"
-          depends="4jdk7dist-jar, 4jdk7dist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="4jdk7clean"
-          description="Removes all 4jdk7 build products">
-
-    <delete dir="${build.4jdk7.dir}"/>
-
+  <target name="jtreg"
+          depends="jar"
+          description="Runs jtreg tests for src/main using the jtreg ant task">
+    <run-jtreg-tests
+       target="${java.runtime.target}"
+       workdir="${build.dir}"
+       classes="${product.jar}"/>
   </target>
 
+  <target name="test"
+          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
+          description="Runs tck and jtreg tests for src/main"/>
 
-  <target name="4jdk7dist-clean"
-          description="Removes all build and distribution products">
-
-  </target>
-
-  <target name="4jdk7dist-jar"
-          depends="4jdk7clean, 4jdk7jar">
-    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
+  <target name="test-version-permutations"
+          depends="test11, test12, test13, test14, test15, test16,
+          test11-12, test11-13, test11-14, test11-15, test11-16,
+          clean, test, docs"
+          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
+
+  <target name="test11">
+    <antcall>
+      <param name="java.runtime.target" value="11"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="4jdk7dist-docs"
-          depends="4jdk7clean, 4jdk7docs">
-    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
+  <target name="test12">
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
+      <param name="build.main.javac" value="${javac12}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="12"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <!-- jsr166x -->
-
-  <target name="jsr166xcompile"
-          depends="configure-compiler"
-          description="Compiles jsr166x sources to build dir">
-
-    <mkdir dir="${build.jsr166x.classes.dir}"/>
-
-    <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166x.classes.dir}"
-           debug="${build.debug}"
-           debuglevel="${build.debuglevel}"
-           deprecation="${build.deprecation}"
-           classpath=""
-           bootclasspath="${bootclasspath6}"
-           source="5"
-           includeAntRuntime="false"
-           includeJavaRuntime="false"
-           executable="${javac7}"
-           fork="true">
-
-      <include name="jsr166x/**/*.java"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
-      <compilerarg line="${build.args}"/>
-
-    </javac>
+  <target name="test13">
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac13}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="13"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="jsr166xjar"
-          depends="jsr166xcompile"
-          description="Builds library jar from compiled sources">
-
-    <jar destfile="${jsr166x.jar}">
-      <fileset dir="${build.jsr166x.classes.dir}"/>
-    </jar>
-
+  <target name="test14">
+    <antcall>
+      <param name="java.runtime.target" value="14"/>
+      <param name="build.main.javac" value="${javac14}"/>
+      <param name="build.main.javadoc" value="${javadoc14}"/>
+      <param name="build.main.javadoc.source" value="14"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="jsr166xdocs"
-          description="Builds javadocs to dist dir">
-
-    <delete dir="${jsr166xdocs.dir}"/>
-    <mkdir dir="${jsr166xdocs.dir}"/>
-
-    <javadoc destdir="${jsr166xdocs.dir}"
-             packagenames="jsr166x.*"
-             link="${jdkapidocs.url}"
-             access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
-             bootclasspath="${bootclasspath6}"
-             source="5"
-             executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
-
-    </javadoc>
+  <target name="test15">
+    <antcall>
+      <param name="java.runtime.target" value="15"/>
+      <param name="build.main.javac" value="${javac15}"/>
+      <param name="build.main.javadoc" value="${javadoc15}"/>
+      <param name="build.main.javadoc.source" value="15"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <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">
-
-    <delete dir="${build.jsr166x.dir}"/>
-
+  <target name="test16">
+    <antcall>
+      <param name="java.runtime.target" value="16"/>
+      <param name="build.main.javac" value="${javac16}"/>
+      <param name="build.main.javadoc" value="${javadoc16}"/>
+      <param name="build.main.javadoc.source" value="16"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="jsr166xdist-clean"
-          description="Removes all build and distribution products">
-
+  <target name="test11-12">
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="jsr166xdist-jar"
-          depends="jsr166xclean, jsr166xjar">
-    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
+  <target name="test11-13">
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-  <target name="jsr166xdist-docs"
-          depends="jsr166xclean, jsr166xdocs">
-    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
+  <target name="test11-14">
+    <antcall>
+      <param name="java.runtime.target" value="14"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc14}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-  <!-- jsr166y -->
-
-
-  <target name="jsr166ycompile"
-          depends="configure-compiler"
-          description="Compiles jsr166y sources">
-
-    <mkdir dir="${build.jsr166y.classes.dir}"/>
-
-    <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166y.classes.dir}"
-           debug="${build.debug}"
-           debuglevel="${build.debuglevel}"
-           deprecation="${build.deprecation}"
-           source="6"
-           classpath=""
-           bootclasspath="${bootclasspath6}"
-           includeAntRuntime="false"
-           includeJavaRuntime="false"
-           executable="${javac7}"
-           fork="true">
-
-      <include name="jsr166y/**/*.java"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all"/>
-      <compilerarg line="${build.args}"/>
-
-    </javac>
+  <target name="test11-15">
+    <antcall>
+      <param name="java.runtime.target" value="15"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc15}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="jsr166yjar"
-          depends="jsr166ycompile"
-          description="Builds library jar from compiled sources">
-
-    <jar destfile="${jsr166y.jar}" index="true">
-      <fileset dir="${build.jsr166y.classes.dir}"/>
-    </jar>
-
+  <target name="test11-16">
+    <antcall>
+      <param name="java.runtime.target" value="16"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc16}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="clean"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-
-  <target name="jsr166ydocs"
-          description="Builds javadocs to dist dir">
-
-    <delete dir="${jsr166ydocs.dir}"/>
-    <mkdir dir="${jsr166ydocs.dir}"/>
-
-    <javadoc destdir="${jsr166ydocs.dir}"
-             packagenames="jsr166y.*"
-             link="${jdkapidocs.url}"
-             access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
-             bootclasspath="${bootclasspath6}"
-             source="6"
-             executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
-
-    </javadoc>
+  <target name="docs16">
+    <antcall>
+      <param name="java.runtime.target" value="16"/>
+      <param name="build.main.javac" value="${javac16}"/>
+      <param name="build.main.javadoc" value="${javadoc16}"/>
+      <param name="build.main.javadoc.source" value="16"/>
+      <target name="clean"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
 
-  <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">
-
-    <delete dir="${build.jsr166y.dir}"/>
+  <target name="configure-compiler">
+    <fail message="ant version too old">
+      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
+    </fail>
 
-  </target>
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
 
+    <condition property="warnunchecked.arg" value="${unchecked.option}">
+      <istrue value="${build.warnunchecked}"/>
+    </condition>
 
-  <target name="jsr166ydist-clean"
-          description="Removes all build and distribution products">
+    <property name="warnunchecked.arg" value=""/>
 
-  </target>
 
-  <target name="jsr166ydist-jar"
-          depends="jsr166yclean, jsr166yjar">
-    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
-  </target>
+    <!-- Common options in javac invocations -->
+    <property name="build.args" value="${warnunchecked.arg}"/>
 
-  <target name="jsr166ydist-docs"
-          depends="jsr166yclean, jsr166ydocs">
-    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
   </target>
 
 
-  <!-- extra166y -->
-
+  <target name="compile-test-loops" depends="jar"
+          description="Compiles all the perf tests in src/test/loops">
 
-  <target name="extra166ycompile"
-          depends="configure-compiler, jsr166yjar"
-          description="Compiles extra166y sources">
+    <mkdir dir="${build.dir}/test/loops"/>
 
-    <mkdir dir="${build.extra166y.classes.dir}"/>
-
-    <javac srcdir="${topsrc.dir}"
-           destdir="${build.extra166y.classes.dir}"
+    <javac srcdir="${basedir}/src/test/loops"
+           destdir="${build.dir}/test/loops"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
-           classpath=""
-           source="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac7}"
+           encoding="ASCII"
+           executable="${build.main.javac}"
            fork="true">
 
-      <include name="extra166y/**/*.java"/>
+      <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
 
-  <target name="extra166yjar"
-          depends="extra166ycompile"
-          description="Builds library jar from compiled sources">
-
-    <jar destfile="${extra166y.jar}" index="true">
-      <fileset dir="${build.extra166y.classes.dir}"/>
-    </jar>
-
-  </target>
-
-
-  <target name="extra166ydocs"
-          description="Builds javadocs to build dir">
-
-    <delete dir="${extra166ydocs.dir}"/>
-    <mkdir dir="${extra166ydocs.dir}"/>
-
-    <javadoc destdir="${extra166ydocs.dir}"
-             packagenames="extra166y.*"
-             link="${jdkapidocs.url}"
-             access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
-             bootclasspath="${bootclasspath6}"
-             source="6"
-             executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
-
-    </javadoc>
-  </target>
-
-
-  <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">
-
-    <delete dir="${build.extra166y.dir}"/>
+  <!-- old branches no longer maintained.  build support deleted -->
+  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
+  <!-- jsr166 4jdk7 (no longer maintained) -->
+  <!-- jsr166x (no longer maintained) -->
+  <!-- jsr166y (no longer maintained) -->
+  <!-- extra166y (no longer maintained) -->
+  <!-- jsr166e (no longer maintained) -->
 
-  </target>
-
-
-  <target name="extra166ydist-clean"
-          description="Removes all build and distribution products">
-
-  </target>
-
-  <target name="extra166ydist-jar"
-          depends="extra166yclean, extra166yjar">
-    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
-  </target>
+<!-- Find buglets that can be detected by static build tools -->
 
-  <target name="extra166ydist-docs"
-          depends="extra166yclean, extra166ydocs">
-    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
+<!--   <target name="lint"> -->
+<!--     <antcall target="dists"> -->
+<!--       <param name="build.javadoc.access" value="protected"/> -->
+<!--     </antcall> -->
+<!--   </target> -->
+
+<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
+  <target name="doclint-private">
+    <antcall target="dist">
+      <param name="build.javadoc.access" value="private"/>
+    </antcall>
   </target>
 
-  <!-- jsr166e -->
 
-  <target name="jsr166ecompile"
-          depends="configure-compiler"
-          description="Compiles jsr166e sources">
-
-    <mkdir dir="${build.jsr166e.classes.dir}"/>
+<!-- ==============================================================
+  Experimental errorprone support
+  https://errorprone.info
+  https://errorprone.info/docs/installation
+  https://github.com/google/error-prone/issues/1143
+=================================================================== -->
+  <path id="errorprone.processorpath.path">
+    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
+    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
+    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
+  </path>
+  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
+  <property name="errorprone.jsr166.user.flags" value=""/>
+  <property name="errorprone.jsr166.flags"
+            value="-Xep:HashtableContains:OFF
+                   -Xep:PreferJavaTimeOverload:OFF
+                   -Xep:JdkObsolete:OFF
+                   -Xep:MissingOverride:OFF
+                   -Xep:MissingFail:OFF
+                   -Xep:ThreadPriorityCheck:OFF
+                   -Xep:MixedArrayDimensions:ERROR
+                   -Xep:RemoveUnusedImports:ERROR
+                   -Xep:EmptyIf:ERROR
+                   -Xep:MultipleTopLevelClasses:ERROR
+                   -Xep:ClassName:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:IdentityBinaryExpression:WARN
+                   -Xep:ConstructorInvokesOverridable:WARN
+                   -Xep:MethodCanBeStatic:WARN
+                   ${errorprone.jsr166.user.flags}"/>
+  <!-- -Xep:WildcardImport:ERROR -->
+  <property name="errorprone.jsr166.test.flags"
+            value="-Xep:StringSplitter:OFF
+                   -Xep:BoxedPrimitiveConstructor:OFF
+                   -Xep:UnnecessaryParentheses:OFF
+                   -Xep:ModifyingCollectionWithItself:OFF"/>
+  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
+  <target name="errorprone"
+          depends="clean, configure-compiler"
+          description="Run errorprone over jsr166 source code (experimental)">
+
+    <local name="destdir"/>
+    <property name="destdir" value="${build.classes.dir}/java.base"/>
+    <mkdir dir="${destdir}"/>
 
-    <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166e.classes.dir}"
+    <javac srcdir="${src.dir}"
+           destdir="${destdir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="7"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac7}"
+           encoding="ASCII"
+           executable="${build.main.javac}"
            fork="true">
 
-      <include name="jsr166e/**/*.java"/>
+      <include name="**/*.java"/>
+      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+      <compilerarg value="-J--illegal-access=permit"/>
+      <compilerarg value="-XDcompilePolicy=simple"/>
+      <compilerarg value="-processorpath"/>
+      <compilerarg pathref="errorprone.processorpath.path"/>
+      <compilerarg value="-Xplugin:ErrorProne
+                          ${errorprone.jsr166.flags}"/>
+      <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>
-  </target>
-
-
-  <target name="jsr166ejar"
-          depends="jsr166ecompile"
-          description="Builds library jar from compiled sources">
 
-    <jar destfile="${jsr166e.jar}" index="true">
-      <fileset dir="${build.jsr166e.classes.dir}"/>
+    <jar destfile="${product.jar}">
+      <fileset dir="${destdir}"/>
     </jar>
 
-  </target>
-
-
-  <target name="jsr166edocs"
-          description="Builds javadocs to build dir">
-
-    <delete dir="${jsr166edocs.dir}"/>
-    <mkdir dir="${jsr166edocs.dir}"/>
-
-    <javadoc destdir="${jsr166edocs.dir}"
-             packagenames="jsr166e.*"
-             link="${jdkapidocs.url}"
-             access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk7src.dir}"
-             source="7"
-             executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
-
-    </javadoc>
-  </target>
-
-
-  <target name="jsr166e-test-tck"
-	  depends="jsr166ejar"
-          description="Runs tck tests for jsr166e">
-
     <run-tck-tests
-      tck.src.dir="${test.src.dir}/tck-jsr166e"
-      target="7"
-      workdir="${build.jsr166e.dir}"
-      classes="${jsr166e.jar}"/>
-  </target>
-
-
-  <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">
-    <delete dir="${build.jsr166e.dir}"/>
-  </target>
-
-
-  <target name="jsr166edist-clean"
-          description="Removes all build and distribution products">
-
-  </target>
-
-  <target name="jsr166edist-jar"
-          depends="jsr166eclean, jsr166ejar">
-    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
-  </target>
-
-  <target name="jsr166edist-docs"
-          depends="jsr166eclean, jsr166edocs">
-    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
+      target="${java.runtime.target}"
+      workdir="${build.dir}"
+      classes="${product.jar}">
+      <javac-elements>
+        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+        <compilerarg value="-J--illegal-access=permit"/>
+        <compilerarg value="-XDcompilePolicy=simple"/>
+        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
+        <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)">
 
-<!-- Find buglets that can be detected by static build tools -->
+    <run-jtreg-tests
+       target="${java.runtime.target}"
+       workdir="${build.dir}"
+       classes="${product.jar}"
+       verbose="all">
+      <jtreg-elements>
+        <arg value="-javacoption:-XDcompilePolicy=simple"/>
+        <arg value="-javacoption:-processorpath"/>
+        <arg value="-javacoption:${errorprone.processorpath}"/>
+        <arg value="-javacoption:-Xplugin:ErrorProne
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}
+                            -Xep:MultipleTopLevelClasses:WARN
+                            -Xep:NonAtomicVolatileUpdate:OFF"/>
+      </jtreg-elements>
+    </run-jtreg-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="${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"/>
+        <path refid="guava.testlib.classpath"/>
+      </classpath>
 
-  <target name="lint">
-    <antcall target="dists">
-      <param name="build.javadoc.access" value="private"/>
-    </antcall>
+      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
+      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
+    </junit>
   </target>
 
-
 </project>