--- jsr166/build.xml	2020/06/05 00:59:33	1.315
+++ jsr166/build.xml	2021/09/29 01:13:44	1.324
@@ -24,17 +24,23 @@
   $HOME/jdk/jdk13
   $HOME/jdk/jdk14
   $HOME/jdk/jdk15
+  $HOME/jdk/jdk16
+  $HOME/jdk/jdk17
+  $HOME/jdk/jdk18
   where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk11
   $HOME/jdk/src/jdk12
   $HOME/jdk/src/jdk13
   $HOME/jdk/src/jdk14
   $HOME/jdk/src/jdk15
+  $HOME/jdk/src/jdk16
+  $HOME/jdk/src/jdk17
+  $HOME/jdk/src/jdk18
   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 .. 15 ...
+  for $N in 11 .. 18 ...
 
   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.
@@ -99,6 +105,9 @@
   <defjdklocations v="13"/>
   <defjdklocations v="14"/>
   <defjdklocations v="15"/>
+  <defjdklocations v="16"/>
+  <defjdklocations v="17"/>
+  <defjdklocations v="18"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -110,6 +119,9 @@
   <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="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg18.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"/>
@@ -137,9 +149,12 @@
   <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="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
+  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
+  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
+  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
   <!-- Default jdk doc location (latest stable LTS release seems best) -->
-  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
+  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
@@ -147,6 +162,9 @@
   <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="${java16.docroot.url}/api/"/>
+  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
+  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -248,6 +266,9 @@
     </sequential>
   </macrodef>
 
+  <defjtregtests v="18"/>
+  <defjtregtests v="17"/>
+  <defjtregtests v="16"/>
   <defjtregtests v="15"/>
   <defjtregtests v="14"/>
   <defjtregtests v="13"/>
@@ -271,18 +292,26 @@
     <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
     <property name="jtreg.verbose" value="nopass,fail,error"/>
 
-    <delete dir="@{workdir}/JTwork"   quiet="true"/>
+    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
+    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
+    <!-- In 2020 concurrency:3 seems like a sweet spot -->
+    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
+    <property name="jtreg.concurrency" value="3"/>
+
+    <delete dir="@{workdir}/JTwork" quiet="true"/>
     <jtreg dir="${jtreg@{target}.src.dir}"
            jdk="${jdk@{target}.home}"
            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="-javacoption:--patch-module=java.base=@{classes}"/>
+      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
+      <arg value="-vmoption:-Xmx256m"/>
+      <arg value="-concurrency:${jtreg.concurrency}"/>
+      <arg value="-vmoptions:-esa -ea"/>
       <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
       <arg value="-agentvm"/>
       <arg value="-noreport"/>
       <arg value="-verbose:@{verbose}"/>
-      <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
@@ -420,6 +449,7 @@
       <arg value="-quiet"/>
       <arg value="-XDignore.symbol.file=true"/>
       <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"/>
@@ -511,7 +541,9 @@
           description="Runs tck and jtreg tests for src/main"/>
 
   <target name="test-version-permutations"
-          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
+          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">
@@ -574,6 +606,18 @@
     </antcall>
   </target>
 
+  <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="test11-12">
     <antcall>
       <param name="java.runtime.target" value="12"/>
@@ -622,6 +666,29 @@
     </antcall>
   </target>
 
+  <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="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="configure-compiler">
     <fail message="ant version too old">
@@ -709,6 +776,7 @@
   <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
@@ -728,6 +796,7 @@
   <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"