--- jsr166/build.xml	2020/12/12 18:58:10	1.321
+++ jsr166/build.xml	2021/03/16 20:38:44	1.323
@@ -146,7 +146,7 @@
   <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://docs.oracle.com/en/java/javase/15/docs"/>
-  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
+  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
   <property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/>
   <!-- Default jdk doc location (latest stable LTS release seems best) -->
   <property name="java.docroot.url"   value="${java11.docroot.url}"/>
@@ -285,18 +285,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}"/>