--- jsr166/build.xml	2018/06/22 18:55:33	1.274
+++ jsr166/build.xml	2018/07/18 01:16:42	1.275
@@ -23,11 +23,13 @@
   $HOME/jdk/jdk9
   $HOME/jdk/jdk10
   $HOME/jdk/jdk11
+  $HOME/jdk/jdk12
   where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk8
   $HOME/jdk/src/jdk9
   $HOME/jdk/src/jdk10
   $HOME/jdk/src/jdk11
+  $HOME/jdk/src/jdk12
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
 
@@ -136,6 +138,7 @@
   <defjdklocations v="9"/>
   <defjdklocations v="10"/>
   <defjdklocations v="11"/>
+  <defjdklocations v="12"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -147,6 +150,7 @@
   <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
   <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
+  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
   <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
@@ -197,6 +201,7 @@
   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
   <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
   <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
+  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
   <!-- Default jdk doc location (latest stable release seems best) -->
   <property name="java.docroot.url"   value="${java10.docroot.url}"/>
 
@@ -208,6 +213,7 @@
   <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
   <property name="java10.api.url"     value="${java10.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="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -321,6 +327,7 @@
     </sequential>
   </macrodef>
 
+  <defjtregtests v="12"/>
   <defjtregtests v="11"/>
   <defjtregtests v="10"/>
   <defjtregtests v="9"/>
@@ -607,7 +614,7 @@
 
 <!--   </target> -->
 
-  <target name="test91011"
+  <target name="test9101112"
           description="Runs tck and jtreg tests for src/main for multiple java versions">
 
     <antcall target="clean"/>
@@ -625,6 +632,11 @@
       <param name="build.main.java.version" value="11"/>
     </antcall>
 
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="12"/>
+    </antcall>
+
     <!-- Clean up to avoid obscure wrong class file version bugs -->
     <antcall target="clean"/>