--- jsr166/build.xml	2016/03/26 15:10:14	1.202
+++ jsr166/build.xml	2019/08/18 18:55:55	1.302
@@ -1,5 +1,7 @@
 <project name="jsr166" default="usage"
-  xmlns:if="ant:if" xmlns:unless="ant:unless">
+  xmlns:if="ant:if"
+  xmlns:unless="ant:unless"
+  xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <description>
 ------------------------------------------------------------------------------
@@ -17,28 +19,30 @@
   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/jdk11
+  $HOME/jdk/jdk12
+  $HOME/jdk/jdk13
+  $HOME/jdk/jdk14
   where each of the above is a JDK or a symlink to same, and
-  $HOME/jdk/src/jdk6
-  $HOME/jdk/src/jdk7
   $HOME/jdk/src/jdk8
-  $HOME/jdk/src/jdk9
+  $HOME/jdk/src/jdk11
+  $HOME/jdk/src/jdk12
+  $HOME/jdk/src/jdk13
+  $HOME/jdk/src/jdk14
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
 
   Alternatively, define ant variables thus:
   ant -Djdk$N.home=... -Djdk$N.src.home=...
-  for $N in 6 7 8 9 ...
+  for $N in 8 .. 14 ...
 
-  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
-  target is currently broken.
+  As of 2016-03, the sources in src/main are for jdk9+ only.
+  As of 2019-08, the sources in src/main are for jdk11+ 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" />
@@ -52,7 +56,6 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -63,7 +66,6 @@
   <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"/>
@@ -104,7 +106,7 @@
     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
       unless:set="have.java.base"/>
     <local name="modules"/>
-    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
+    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
     <local name="boot.jar.dir"/>
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
     <path id="bootclasspath@{v}" unless:set="modules">
@@ -130,20 +132,23 @@
     </sequential>
   </macrodef>
 
-  <defjdklocations v="6"/>
-  <defjdklocations v="7"/>
   <defjdklocations v="8"/>
-  <defjdklocations v="9"/>
+  <defjdklocations v="11"/>
+  <defjdklocations v="12"/>
+  <defjdklocations v="13"/>
+  <defjdklocations v="14"/>
 
   <!-- 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="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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
+  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
   <property name="topsrc.dir"           location="${basedir}/src"/>
@@ -182,22 +187,27 @@
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
-  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
-  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
-  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
-  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
-  <!-- The expected canonical location does not yet exist as of 2016-03 -->
-  <!-- <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"/>
-  <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
+  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
+  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
+  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
+  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
+  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
+  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
+  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
+  <!-- The location of jdk early access docs (RIP) -->
+  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
+<!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
+  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
+  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
+  <!-- Default jdk doc location (latest stable LTS release seems best) -->
+  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
-  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
-  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
-  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
   <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
-  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
+  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
+  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
+  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
+  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -230,7 +240,12 @@
 
     <local name="modules"/>
     <condition property="modules">
-      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
+      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
+    </condition>
+
+    <local name="use-doclint"/>
+    <condition property="use-doclint">
+      <not> <equals arg1="@{target}" arg2="7"/> </not>
     </condition>
 
     <mkdir dir="@{workdir}/tck-classes"/>
@@ -245,14 +260,16 @@
            classpath="${junit.jar}"
            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,-try"/>
+      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
       <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -263,10 +280,17 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
 	<jvmarg line="@{jvmflags}"/>
+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
 
-        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
+	<!-- 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."/>
@@ -283,37 +307,37 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
-  <fileset dir="${jtreg9.src.dir}">
-    <patternset id="jdk9.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg8.src.dir}">
-    <patternset id="jdk8.jtreg.tests">
-      <include name="**/*.java"/>
-      <exclude name="**/SpliteratorCharacteristics.java"/>
-      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
-      <exclude name="**/GCDuringIteration.java"/>
-    </patternset>
-  </fileset>
+  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
+  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
+  <property name="jtreg.test.pattern" value="**/*.java"/>
+  <macrodef name="defjtregtests">
+    <attribute name="v"/>
+    <sequential>
+      <fileset dir="${jtreg@{v}.src.dir}">
+        <patternset id="jdk@{v}.jtreg.tests">
+          <include name="${jtreg.test.pattern}"/>
+        </patternset>
+      </fileset>
+    </sequential>
+  </macrodef>
 
-  <fileset dir="${jtreg7.src.dir}">
-    <patternset id="jdk7.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
+  <defjtregtests v="14"/>
+  <defjtregtests v="13"/>
+  <defjtregtests v="12"/>
+  <defjtregtests v="11"/>
+  <defjtregtests v="8"/>
 
   <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
   <property name="jtreg.flags" value=""/>
 
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
-    <attribute name="source" default="7"/>
+    <!-- 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>
 
@@ -322,29 +346,26 @@
 
     <local name="modules"/>
     <condition property="modules">
-      <available file="${jdk@{target}.home}/jmods" type="dir"/>
+      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
     </condition>
 
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
-    <delete dir="@{workdir}/JTreport" quiet="true"/>
-    <mkdir dir="@{workdir}/JTwork/scratch"/>
-    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
-    <mkdir dir="@{workdir}/JTreport/html"/>
-    <mkdir dir="@{workdir}/JTreport/text"/>
     <jtreg dir="${jtreg@{target}.src.dir}"
            jdk="${jdk@{target}.home}"
-           workDir="@{workdir}/JTwork"
-           reportDir="@{workdir}/JTreport">
+           workDir="@{workdir}/JTwork">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
+      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
       <arg value="-agentvm"/>
-      <arg value="-verbose:${jtreg.verbose}"/>
+      <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>
@@ -355,33 +376,39 @@
   </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 -->
 
-  <property name="build.main.java.version" value="9"/>
-  <property name="build.main.javac" value="${javac9}"/>
+  <!-- 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, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          depends="dist, 4jdk8dist"
           description="Builds all public jars and docs"/>
+          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
 
   <target name="compile"
           depends="configure-compiler"
           description="Compiles src/main sources to build dir">
 
-    <local name="modules"/>
-    <condition property="modules">
-      <and>
-        <available file="${jdk9.home}/jmods" type="dir"/>
-        <equals arg1="9" arg2="${build.main.java.version}"/>
-      </and>
-    </condition>
-
     <local name="destdir"/>
-    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
-    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
+    <property name="destdir" value="${build.classes.dir}/java.base"/>
 
     <mkdir dir="${destdir}"/>
 
@@ -393,34 +420,34 @@
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${build.main.javac}"
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
+      <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all"/>
+<!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
+      <compilerarg value="-Xlint:all,-removal"/>
+      <compilerarg line="--doclint-format html5"/>
+      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
+      <compilerarg value="-Xdoclint/package:java.util.*"/>
       <compilerarg value="-Werror"/>
-      <compilerarg value="-Xdoclint:all/protected"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
-
-    <!-- We need jdk9's Contended annotation, but at compile time only -->
-    <!--
-        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
-    -->
   </target>
 
 
   <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."/>
@@ -438,34 +465,40 @@
     <!-- 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}"
+             link="${java.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${src.dir}:${jdk9.src.dir}"
+             sourcepath="${src.dir}"
              classpath=""
-             executable="${javadoc9}">
+             source="${build.main.javadoc.source}"
+             executable="${build.main.javadoc}">
+<!-- TODO: JDK-8214571 failonerror = "true" -->
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
-      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
-<!--  TODO     <arg value="-Xmodule:java.base"/> -->
-      <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;"/>
-<!-- tags added in jdk9 -->
-      <arg value="-tag"/>
-      <arg value="revised:X"/>
-      <arg value="-tag"/>
-      <arg value="spec:X"/>
+      <arg value="-html5"/>
+      <arg value="--patch-module=java.base=${src.dir}"/>
+<!-- old school frames via docs/index.html?overview-summary.html -->
+<!-- TODO: - -frames no longer a supported option in jdk13+ -->
+      <arg value="--frames"/>
+      <arg value="--override-methods=summary"/>
+      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
+      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
+      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
+<!-- tags added in jdk9: currently unused -->
+<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
+<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -475,42 +508,16 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-  <target name="release"
-          depends="dist"
-          description="Puts entire CVS tree, plus distribution productions, in a jar">
-
-    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
-
-    <jar basedir="${basedir}" destfile="${release.jar}">
-      <!-- <exclude name="build/**"/> -->
-      <exclude name="${release.jar}"/>
-      <exclude name="user.properties"/>
-      <exclude name="etc/notes/**"/>
-      <exclude name="src/emulation/**"/>
-      <exclude name="**/SyntaxTest.java"/>
-      <exclude name="**/SuperfluousAbstract.java"/>
-      <manifest>
-        <attribute name="Built-By" value="${user.name}"/>
-        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
-      </manifest>
-    </jar>
-  </target>
-
-
   <target name="clean"
           description="Removes all build products">
-
     <delete dir="${build.dir}"/>
-
   </target>
 
 
   <target name="dist-clean"
           description="Removes all build and distribution products">
-
     <delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
-
   </target>
 
 
@@ -526,75 +533,170 @@
 
   <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}"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
-      classes="${product.jar}"/>
+      classes="${product.jar}">
+      <javac-elements>
+        <compilerarg value="-Werror"/>
+      </javac-elements>
+    </run-tck-tests>
   </target>
 
   <target name="tck-parallelism-1"
-          description="Runs tck with given common pool parallelism">
+          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="tck-parallelism-0"
-          description="Runs tck with given common pool parallelism">
+          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="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}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}"/>
   </target>
 
   <target name="test"
-          depends="tck, tck-parallelism-1, 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 name="test-version-permutations"
+	  depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
   </target>
 
-  <target name="jtreg8" description="Runs jtreg tests with jdk8">
+  <!-- jdk9 is unsupported as of 2019-08 -->
+<!--   <target name="test9"> -->
+<!--     <antcall target="clean"/> -->
+<!--     <antcall> -->
+<!--       <param name="java.runtime.target" value="9"/> -->
+<!--       <param name="build.main.javac" value="${javac9}"/> -->
+<!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
+<!--       <param name="build.main.javadoc.source" value="9"/> -->
+<!--       <target name="test"/> -->
+<!--       <target name="docs"/> -->
+<!--     </antcall> -->
+<!--   </target> -->
+
+  <!-- jdk10 is unsupported as of 2019-08 -->
+<!--   <target name="test10"> -->
+<!--     <antcall target="clean"/> -->
+<!--     <antcall> -->
+<!--       <param name="java.runtime.target" value="10"/> -->
+<!--       <param name="build.main.javac" value="${javac10}"/> -->
+<!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
+<!--       <param name="build.main.javadoc.source" value="10"/> -->
+<!--       <target name="test"/> -->
+<!--       <target name="docs"/> -->
+<!--     </antcall> -->
+<!--   </target> -->
 
-    <antcall target="jtreg">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
+  <target name="test11">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="11"/>
+      <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test12">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
+      <param name="build.main.javac" value="${javac12}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="12"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
-  <target name="test89"
-          description="Runs tck and jtreg tests for main for multiple java versions">
+  <target name="test13">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="13"/>
+      <param name="build.main.javac" value="${javac13}"/>
+      <param name="build.main.javadoc" value="${javadoc13}"/>
+      <param name="build.main.javadoc.source" value="13"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
+  <target name="test14">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
+    <antcall>
+      <param name="java.runtime.target" value="14"/>
+      <param name="build.main.javac" value="${javac14}"/>
+      <param name="build.main.javadoc" value="${javadoc14}"/>
+      <param name="build.main.javadoc.source" value="14"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test11-12">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="9"/>
-      <param name="build.main.javac" value="${javac9}"/>
+    <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="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test11-13">
+    <antcall target="clean"/>
+    <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="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
+  <target name="test11-14">
+    <antcall target="clean"/>
+    <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="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
 
   <target name="configure-compiler">
     <fail message="ant version too old">
-      <condition>
-	<not> <antversion atleast="1.9.1"/> </not>
-      </condition>
+      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
     </fail>
 
     <property name="unchecked.option" value="-Xlint:unchecked"/>
@@ -612,39 +714,8 @@
   </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}"
-           target="${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>
-
-
   <target name="compile-test-loops" depends="jar"
-          description="compile all the perf tests in src/test/loops">
+          description="Compiles all the perf tests in src/test/loops">
 
     <mkdir dir="${build.dir}/test/loops"/>
 
@@ -655,7 +726,8 @@
            deprecation="${build.deprecation}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac9}"
+           encoding="ASCII"
+           executable="${build.main.javac}"
            fork="true">
 
       <include name="*.java"/>
@@ -663,9 +735,7 @@
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
       <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
-
   </target>
 
 
@@ -688,16 +758,15 @@
            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>
 
@@ -718,16 +787,15 @@
            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"/>
+      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
@@ -743,7 +811,6 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
 
@@ -759,6 +826,7 @@
         <!-- JDK9+ test classes -->
         <exclude name="*9Test.java"/>
         <exclude name="*10Test.java"/>
+        <compilerarg value="-Werror"/>
       </javac-elements>
     </run-tck-tests>
   </target>
@@ -776,8 +844,7 @@
 
   <target name="4jdk8-test"
 	  depends="4jdk8-tck, 4jdk8-jtreg"
-          description="Runs tck and jtreg tests for jsr166-4jdk8">
-  </target>
+          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
 
 
   <target name="4jdk8docs"
@@ -793,20 +860,19 @@
              access="${build.javadoc.access}"
              sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
              classpath=""
-             executable="${javadoc8}">
+             source="8"
+             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}"/>
-      <arg value="-tag"/>
-      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
-      <arg value="-tag"/>
-      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
-      <arg value="-tag"/>
-      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
+      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+<!-- @apiNote tag currently unused -->
+<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
     </javadoc>
   </target>
 
@@ -818,9 +884,7 @@
 
   <target name="4jdk8clean"
           description="Removes all 4jdk8 build products">
-
     <delete dir="${build.4jdk8.dir}"/>
-
   </target>
 
 
@@ -836,13 +900,9 @@
   </target>
 
 
+  <!-- jsr166 4jdk7 (no longer maintained) -->
 
-  <!-- jsr166 4jdk7 -->
-
-  <target name="4jdk7compile"
-          depends="configure-compiler"
-          description="Compiles src/jdk7 sources, targeting jdk7">
-
+  <target name="4jdk7compile" depends="configure-compiler">
     <mkdir dir="${build.4jdk7.classes.dir}"/>
 
     <javac srcdir="${4jdk7src.dir}"
@@ -856,6 +916,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -865,14 +926,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-  <target name="4jdk7doclint"
-          depends="configure-compiler"
-          description="Finds doclint warnings">
-
+  <target name="4jdk7doclint" depends="configure-compiler">
     <mkdir dir="${build.4jdk7.classes.dir}"/>
 
     <javac srcdir="${4jdk7src.dir}"
@@ -886,6 +943,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -895,15 +953,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Xdoclint:all/protected"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="4jdk7jar"
-          depends="4jdk7compile"
-          description="Builds library jar from compiled sources">
-
+  <target name="4jdk7jar" depends="4jdk7compile">
     <jar destfile="${4jdk7product.jar}">
       <fileset dir="${build.4jdk7.classes.dir}"/>
       <manifest>
@@ -911,14 +964,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="4jdk7-tck"
-	  depends="4jdk7jar"
-          description="Runs tck tests for jsr166-4jdk7 directly">
-
+  <target name="4jdk7-tck" depends="4jdk7jar">
     <run-tck-tests
       target="7"
       workdir="${build.4jdk7.dir}"
@@ -936,14 +984,13 @@
         <exclude name="SplittableRandomTest.java"/>
         <exclude name="StampedLockTest.java"/>
         <exclude name="SubmissionPublisherTest.java"/>
+        <compilerarg value="-Werror"/>
       </javac-elements>
     </run-tck-tests>
   </target>
 
-
-  <target name="4jdk7-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"
@@ -965,29 +1012,19 @@
 
       <test name="${jsr166.tckTestClass}" haltonfailure="no">
       </test>
-
     </junit>
   </target>
 
-  <target name="4jdk7-jtreg"
-	  depends="4jdk7jar"
-          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
+  <target name="4jdk7-jtreg" depends="4jdk7jar">
     <run-jtreg-tests
        target="7"
        workdir="${build.4jdk7.dir}"
        classes="${4jdk7product.jar}"/>
   </target>
 
+  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
 
-  <target name="4jdk7-test"
-	  depends="4jdk7-tck, 4jdk7-jtreg"
-          description="Runs tck and jtreg tests for jsr166-4jdk7">
-  </target>
-
-
-  <target name="4jdk7docs"
-          description="Builds javadocs for src/jdk7 to dist dir">
-
+  <target name="4jdk7docs">
     <delete dir="${4jdk7docs.dir}"/>
     <mkdir dir="${4jdk7docs.dir}"/>
 
@@ -998,7 +1035,8 @@
              access="${build.javadoc.access}"
              sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
              classpath=""
-             executable="${javadoc7}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -1007,38 +1045,24 @@
     </javadoc>
   </target>
 
+  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
 
-  <target name="4jdk7dist"
-          depends="4jdk7dist-jar, 4jdk7dist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="4jdk7clean"
-          description="Removes all 4jdk7 build products">
-
+  <target name="4jdk7clean">
     <delete dir="${build.4jdk7.dir}"/>
-
   </target>
 
-
-  <target name="4jdk7dist-jar"
-          depends="4jdk7clean, 4jdk7jar">
+  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
   </target>
 
-
-  <target name="4jdk7dist-docs"
-          depends="4jdk7clean, 4jdk7docs">
+  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
     <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
   </target>
 
 
-  <!-- jsr166x -->
-
-  <target name="jsr166xcompile"
-          depends="configure-compiler"
-          description="Compiles jsr166x sources to build dir">
+  <!-- jsr166x (no longer maintained) -->
 
+  <target name="jsr166xcompile" depends="configure-compiler">
     <mkdir dir="${build.jsr166x.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1052,23 +1076,18 @@
            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>
   </target>
 
-
-  <target name="jsr166xjar"
-          depends="jsr166xcompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="jsr166xjar" depends="jsr166xcompile">
     <jar destfile="${jsr166x.jar}">
       <fileset dir="${build.jsr166x.classes.dir}"/>
       <manifest>
@@ -1076,13 +1095,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="jsr166xdocs"
-          description="Builds javadocs to dist dir">
-
+  <target name="jsr166xdocs">
     <delete dir="${jsr166xdocs.dir}"/>
     <mkdir dir="${jsr166xdocs.dir}"/>
 
@@ -1093,44 +1108,31 @@
              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"/>
-
     </javadoc>
   </target>
 
+  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
 
-  <target name="jsr166xdist"
-          depends="jsr166xdist-jar, jsr166xdist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="jsr166xclean"
-          description="Removes all jsr166x build products">
-
+  <target name="jsr166xclean">
     <delete dir="${build.jsr166x.dir}"/>
-
   </target>
 
-
-  <target name="jsr166xdist-jar"
-          depends="jsr166xclean, jsr166xjar">
+  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
     <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="jsr166xdist-docs"
-          depends="jsr166xclean, jsr166xdocs">
+  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
     <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
   </target>
 
-  <!-- jsr166y -->
-
 
-  <target name="jsr166ycompile"
-          depends="configure-compiler"
-          description="Compiles jsr166y sources">
+  <!-- jsr166y (no longer maintained) -->
 
+  <target name="jsr166ycompile" depends="configure-compiler">
     <mkdir dir="${build.jsr166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1144,6 +1146,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1152,15 +1155,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="jsr166yjar"
-          depends="jsr166ycompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="jsr166yjar" depends="jsr166ycompile">
     <jar destfile="${jsr166y.jar}" index="true">
       <fileset dir="${build.jsr166y.classes.dir}"/>
       <manifest>
@@ -1168,13 +1166,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="jsr166ydocs"
-          description="Builds javadocs to dist dir">
-
+  <target name="jsr166ydocs">
     <delete dir="${jsr166ydocs.dir}"/>
     <mkdir dir="${jsr166ydocs.dir}"/>
 
@@ -1185,45 +1179,31 @@
              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"/>
-
     </javadoc>
   </target>
 
+  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
 
-  <target name="jsr166ydist"
-          depends="jsr166ydist-jar, jsr166ydist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="jsr166yclean"
-          description="Removes all jsr166y build products">
-
+  <target name="jsr166yclean">
     <delete dir="${build.jsr166y.dir}"/>
-
   </target>
 
-
-  <target name="jsr166ydist-jar"
-          depends="jsr166yclean, jsr166yjar">
+  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
     <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="jsr166ydist-docs"
-          depends="jsr166yclean, jsr166ydocs">
+  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
     <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
   </target>
 
 
-  <!-- extra166y -->
-
-
-  <target name="extra166ycompile"
-          depends="configure-compiler, jsr166yjar"
-          description="Compiles extra166y sources">
+  <!-- extra166y (no longer maintained) -->
 
+  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
     <mkdir dir="${build.extra166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1237,6 +1217,7 @@
            target="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1245,15 +1226,10 @@
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-
-  <target name="extra166yjar"
-          depends="extra166ycompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="extra166yjar" depends="extra166ycompile">
     <jar destfile="${extra166y.jar}" index="true">
       <fileset dir="${build.extra166y.classes.dir}"/>
       <manifest>
@@ -1261,13 +1237,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="extra166ydocs"
-          description="Builds javadocs to build dir">
-
+  <target name="extra166ydocs">
     <delete dir="${extra166ydocs.dir}"/>
     <mkdir dir="${extra166ydocs.dir}"/>
 
@@ -1281,43 +1253,30 @@
              executable="${javadoc7}">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-
     </javadoc>
   </target>
 
+  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
 
-  <target name="extra166ydist"
-          depends="extra166ydist-jar, extra166ydist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
-
-  <target name="extra166yclean"
-          description="Removes all extra166y build products">
-
+  <target name="extra166yclean">
     <delete dir="${build.extra166y.dir}"/>
-
   </target>
 
-
-  <target name="extra166ydist-jar"
-          depends="extra166yclean, extra166yjar">
+  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
     <copy file="${extra166y.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="extra166ydist-docs"
-          depends="extra166yclean, extra166ydocs">
+  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
     <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
   </target>
 
-  <!-- jsr166e -->
+
+  <!-- jsr166e (no longer maintained) -->
 
   <property name="build.jsr166e.java.version" value="6"/>
   <property name="build.jsr166e.javac" value="${javac6}"/>
 
-  <target name="jsr166ecompile"
-          depends="configure-compiler"
-          description="Compiles jsr166e sources">
-
+  <target name="jsr166ecompile" depends="configure-compiler">
     <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1338,13 +1297,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
-
     </javac>
   </target>
 
-  <!-- jsr166e: find doclint errors -->
   <target name="jsr166edoclint">
-
     <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
@@ -1366,15 +1322,10 @@
       <compilerarg value="-Xlint:all"/>
       <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
-
     </javac>
   </target>
 
-
-  <target name="jsr166ejar"
-          depends="jsr166ecompile"
-          description="Builds library jar from compiled sources">
-
+  <target name="jsr166ejar" depends="jsr166ecompile">
     <jar destfile="${jsr166e.jar}" index="true">
       <fileset dir="${build.jsr166e.classes.dir}"/>
       <manifest>
@@ -1382,13 +1333,9 @@
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
       </manifest>
     </jar>
-
   </target>
 
-
-  <target name="jsr166edocs"
-          description="Builds javadocs to build dir">
-
+  <target name="jsr166edocs">
     <delete dir="${jsr166edocs.dir}"/>
     <mkdir dir="${jsr166edocs.dir}"/>
 
@@ -1398,19 +1345,15 @@
              access="${build.javadoc.access}"
              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"/>
-
     </javadoc>
   </target>
 
-
-  <target name="jsr166e-tck-one-java-version"
-	  depends="jsr166ejar">
-
+  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
     <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
-
     <run-tck-tests
       tck.src.dir="${test.src.dir}/tck-jsr166e"
       target="${build.jsr166e.java.version}"
@@ -1418,8 +1361,7 @@
       classes="${jsr166e.jar}"/>
   </target>
 
-  <target name="jsr166e-tck"
-          description="Runs tck tests for jsr166e for multiple java versions">
+  <target name="jsr166e-tck">
 
 <!--     <antcall target="clean"/> -->
 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
@@ -1440,48 +1382,223 @@
     </antcall>
   </target>
 
+  <target name="jsr166e-test" depends="jsr166e-tck"/>
 
-  <target name="jsr166e-test"
-	  depends="jsr166e-tck"
-          description="Runs all tests for jsr166e">
-  </target>
-
-  <target name="jsr166edist"
-          depends="jsr166edist-jar, jsr166edist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
+  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
 
-  <target name="jsr166eclean"
-          description="Removes all jsr166e build products">
+  <target name="jsr166eclean">
     <delete dir="${build.jsr166e.dir}"/>
   </target>
 
-
   <target name="jsr166edist-jar"
           depends="jsr166eclean, jsr166ejar">
     <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
   </target>
 
-  <target name="jsr166edist-docs"
-          depends="jsr166eclean, jsr166edocs">
+  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
     <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
   </target>
 
 
 <!-- Find buglets that can be detected by static build tools -->
 
-  <target name="lint">
-    <antcall target="dists">
-      <param name="build.javadoc.access" value="public"/>
-    </antcall>
-  </target>
+<!--   <target name="lint"> -->
+<!--     <antcall target="dists"> -->
+<!--       <param name="build.javadoc.access" value="protected"/> -->
+<!--     </antcall> -->
+<!--   </target> -->
 
 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
-  <target name="lint-private">
+  <target name="doclint-private">
     <antcall target="dist">
       <param name="build.javadoc.access" value="private"/>
     </antcall>
   </target>
 
 
+<!-- ==============================================================
+  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.2-with-dependencies.jar"/>
+    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
+  </path>
+  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
+  <property name="errorprone.jsr166.user.flags" value=""/>
+  <property name="errorprone.jsr166.flags"
+            value="-Xep:HashtableContains:OFF
+                   -Xep:JdkObsolete:OFF
+                   -Xep:MissingOverride:OFF
+                   -Xep:MissingFail:OFF
+                   -Xep:ThreadPriorityCheck:OFF
+                   -Xep:MixedArrayDimensions:ERROR
+                   -Xep:RemoveUnusedImports:ERROR
+                   -Xep:EmptyIf:ERROR
+                   -Xep:MultipleTopLevelClasses:ERROR
+                   -Xep:ClassName:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:IdentityBinaryExpression:WARN
+                   -Xep:ConstructorInvokesOverridable:WARN
+                   -Xep:MethodCanBeStatic:WARN
+                   ${errorprone.jsr166.user.flags}"/>
+  <!-- -Xep:WildcardImport:ERROR -->
+  <property name="errorprone.jsr166.test.flags"
+            value="-Xep:StringSplitter:OFF
+                   -Xep:BoxedPrimitiveConstructor:OFF
+                   -Xep:ModifyingCollectionWithItself:OFF"/>
+  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
+  <target name="errorprone"
+          depends="clean, configure-compiler"
+          description="Run errorprone over jsr166 source code (experimental)">
+
+    <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"/>
+      <!-- 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>
+
+    <jar destfile="${product.jar}">
+      <fileset dir="${destdir}"/>
+    </jar>
+
+    <run-tck-tests
+      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)">
+
+    <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>
+
+      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
+      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
+    </junit>
+  </target>
+
 </project>