--- jsr166/build.xml	2019/10/06 17:51:03	1.305
+++ jsr166/build.xml	2022/11/25 20:33:50	1.327
@@ -19,24 +19,20 @@
   itself.  Because the JDK version matters and because different
   targets require different JDKs, we assume that users have created a
   hierarchy containing:
-  $HOME/jdk/jdk11
-  $HOME/jdk/jdk12
-  $HOME/jdk/jdk13
-  $HOME/jdk/jdk14
+  $HOME/jdk/jdk17
+  $HOME/jdk/jdk19
   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/jdk17
   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 .. 14 ...
+  for $N in 17 .. 19 ...
 
   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.
+  As of 2022-02, the sources in src/main are for jdk17+ only.
 ------------------------------------------------------------------------------
   </description>
 
@@ -92,21 +88,21 @@
     </sequential>
   </macrodef>
 
-  <defjdklocations v="11"/>
-  <defjdklocations v="12"/>
-  <defjdklocations v="13"/>
-  <defjdklocations v="14"/>
+  <defjdklocations v="17"/>
+  <defjdklocations v="18"/>
+  <defjdklocations v="19"/>
+  <defjdklocations v="20"/>
 
   <!-- 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="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="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
   <property name="topsrc.dir"           location="${basedir}/src"/>
@@ -121,26 +117,18 @@
 
   <!-- 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://download.java.net/java/early_access/jdk14/docs"/>
+  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
+  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
+  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
+  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/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/"/>
-  <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="java17.api.url"     value="${java17.docroot.url}/api/"/>
+  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
+  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
+  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -242,16 +230,15 @@
     </sequential>
   </macrodef>
 
-  <defjtregtests v="14"/>
-  <defjtregtests v="13"/>
-  <defjtregtests v="12"/>
-  <defjtregtests v="11"/>
+  <defjtregtests v="17"/>
+  <defjtregtests v="18"/>
+  <defjtregtests v="19"/>
+  <defjtregtests v="20"/>
 
   <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
   <property name="jtreg.flags" value=""/>
 
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
@@ -264,17 +251,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}"/>
@@ -297,19 +293,11 @@
   <!-- 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}"/>
+  <!-- At runtime, target latest, but build for current LTS -->
+  <property name="java.runtime.target" value="19"/>
+  <property name="build.main.java" value="${java17}"/>
+  <property name="build.main.javac" value="${javac17}"/>
+  <property name="build.main.javadoc" value="${javadoc19}"/>
   <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
 
   <target name="dists"
@@ -341,19 +329,15 @@
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-<!--   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="-Xlint:all"/>
+      <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>
   </target>
 
-
   <target name="jar"
           depends="compile"
           description="Builds library jar for src/main from compiled sources">
@@ -371,25 +355,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="${java.api.url}"
@@ -399,14 +366,16 @@
              classpath=""
              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 line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
+      <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"/>
@@ -414,31 +383,24 @@
       <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>
 
-
   <target name="dist"
           depends="dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
-
   <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>
 
-
   <target name="dist-jar"
           depends="clean, jar">
     <copy file="${product.jar}" todir="${dist.dir}"/>
@@ -452,13 +414,12 @@
   <target name="tck"
           depends="jar"
           description="Runs tck tests for src/main directly">
-
     <run-tck-tests
       target="${java.runtime.target}"
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
-        <compilerarg value="-Werror"/>
+        <!-- <compilerarg value="-Werror"/> -->
       </javac-elements>
     </run-tck-tests>
   </target>
@@ -498,88 +459,28 @@
           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>
+          depends="test17, test19, clean, test, docs"
+          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
 
-  <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"/>
+  <target name="test17">
     <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"/>
+      <param name="java.runtime.target" value="17"/>
+      <param name="build.main.javac" value="${javac17}"/>
+      <param name="build.main.javadoc" value="${javadoc17}"/>
+      <param name="build.main.javadoc.source" value="17"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
   </target>
-
-  <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>
-      <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>
-      <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"/>
+  <target name="test19">
     <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"/>
+      <param name="java.runtime.target" value="19"/>
+      <param name="build.main.javac" value="${javac19}"/>
+      <param name="build.main.javadoc" value="${javadoc19}"/>
+      <param name="build.main.javadoc.source" value="19"/>
+      <target name="clean"/>
       <target name="test"/>
       <target name="docs"/>
     </antcall>
@@ -662,15 +563,17 @@
   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}/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
@@ -690,6 +593,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"
@@ -725,7 +629,8 @@
       <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="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
+      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
       <compilerarg line="${build.args}"/>
     </javac>
 
@@ -745,7 +650,8 @@
         <compilerarg value="-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
                             ${errorprone.jsr166.test.flags}"/>
-        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
+        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
+        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
       </javac-elements>
     </run-tck-tests>
   </target>