--- jsr166/build.xml	2022/03/22 21:28:02	1.325
+++ jsr166/build.xml	2023/01/07 16:30:33	1.328
@@ -91,6 +91,8 @@
   <defjdklocations v="17"/>
   <defjdklocations v="18"/>
   <defjdklocations v="19"/>
+  <defjdklocations v="20"/>
+  <defjdklocations v="21"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -100,6 +102,8 @@
   <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="jtreg21.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"/>
@@ -116,8 +120,10 @@
   <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
   <!-- Switched to https: in 2017-10 - JDK-8190312 -->
   <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"/>
-  <property name="java19.docroot.url" value="https://download.java.net/java/early_access/jdk19/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"/>
+  <property name="java21.docroot.url" value="https://download.java.net/java/early_access/jdk21/docs"/>
   <!-- Default jdk doc location (latest stable LTS release seems best) -->
   <property name="java.docroot.url"   value="${java17.docroot.url}"/>
 
@@ -125,6 +131,8 @@
   <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="java21.api.url"     value="${java21.docroot.url}/api/"/>
   <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -226,9 +234,11 @@
     </sequential>
   </macrodef>
 
-  <defjtregtests v="19"/>
-  <defjtregtests v="17"/>
   <defjtregtests v="17"/>
+  <defjtregtests v="18"/>
+  <defjtregtests v="19"/>
+  <defjtregtests v="20"/>
+  <defjtregtests v="21"/>
 
   <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
   <property name="jtreg.flags" value=""/>