--- jsr166/build.xml	2018/03/21 23:10:39	1.269
+++ jsr166/build.xml	2018/10/01 00:10:52	1.278
@@ -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.
 
@@ -104,7 +106,7 @@
     <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
       unless:set="have.java.base"/>
     <local name="modules"/>
-    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
+    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
     <local name="boot.jar.dir"/>
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
     <path id="bootclasspath@{v}" unless:set="modules">
@@ -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"/>
@@ -193,12 +197,14 @@
   <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
   <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
+  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
   <!-- The location of jdk early access docs (RIP) -->
   <!-- <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="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
+  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
   <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
+  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -208,6 +214,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 -->
@@ -240,7 +247,7 @@
 
     <local name="modules"/>
     <condition property="modules">
-      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
+      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
     </condition>
 
     <local name="use-doclint"/>
@@ -321,6 +328,7 @@
     </sequential>
   </macrodef>
 
+  <defjtregtests v="12"/>
   <defjtregtests v="11"/>
   <defjtregtests v="10"/>
   <defjtregtests v="9"/>
@@ -346,7 +354,7 @@
 
     <local name="modules"/>
     <condition property="modules">
-      <available file="${jdk@{target}.home}/jmods" type="dir"/>
+      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
     </condition>
 
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
@@ -381,7 +389,7 @@
 
   <!-- Main targets -->
 
-  <property name="build.main.java.version" value="9"/>
+  <property name="build.main.java.version" value="11"/>
   <!-- Workaround "no nested properties in ant" -->
   <macrodef name="define-build-main-properties">
     <attribute name="v"/>
@@ -473,17 +481,17 @@
 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${java9.api.url}"
+             link="${java10.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${src.dir}"
              classpath=""
-             source="9"
+             source="11"
              executable="${build.main.javadoc}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
-      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-html5"/>
@@ -492,8 +500,7 @@
       <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
       <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
-<!-- @apiNote tag currently unused -->
-<!--  <arg value="-tag"/> <arg value="apiNote:a:API 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"/> -->
@@ -608,22 +615,41 @@
 
 <!--   </target> -->
 
-  <target name="test91011"
+  <target name="test9101112"
           description="Runs tck and jtreg tests for src/main for multiple java versions">
 
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="9"/>
+      <param name="build.main.java" value="${java9}"/>
+      <param name="build.main.javac" value="${javac9}"/>
     </antcall>
 
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="10"/>
+      <param name="build.main.java" value="${java10}"/>
+      <param name="build.main.javac" value="${javac10}"/>
     </antcall>
 
     <antcall target="clean"/>
     <antcall target="test">
       <param name="build.main.java.version" value="11"/>
+      <param name="build.main.java" value="${java11}"/>
+      <param name="build.main.javac" value="${javac11}"/>
+    </antcall>
+
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="12"/>
+      <param name="build.main.java" value="${java12}"/>
+      <param name="build.main.javac" value="${javac12}"/>
+    </antcall>
+    <antcall target="docs">
+      <param name="build.main.java.version" value="12"/>
+      <param name="build.main.java" value="${java12}"/>
+      <param name="build.main.javac" value="${javac12}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
     </antcall>
 
     <!-- Clean up to avoid obscure wrong class file version bugs -->
@@ -1387,9 +1413,9 @@
 
 
 <!-- ==============================================================
-  Experimental errorprone support - http://errorprone.info
+  Experimental errorprone support - https://errorprone.info
 =================================================================== -->
-  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
   <property name="errorprone.jsr166.user.flags" value=""/>
   <property name="errorprone.jsr166.flags"
             value="-Xep:HashtableContains:OFF
@@ -1433,6 +1459,8 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+      <compilerarg value="-J--illegal-access=permit"/>
       <compilerarg value="-XDcompilePolicy=simple"/>
       <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
@@ -1455,6 +1483,8 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
+        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+        <compilerarg value="-J--illegal-access=permit"/>
         <compilerarg value="-XDcompilePolicy=simple"/>
         <compilerarg line="-processorpath ${errorprone.jar}"/>
         <compilerarg value="-Xplugin:ErrorProne
@@ -1483,6 +1513,7 @@
         <arg value="-javacoption:-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
                             ${errorprone.jsr166.test.flags}
+                            -Xep:MultipleTopLevelClasses:WARN
                             -Xep:NonAtomicVolatileUpdate:OFF"/>
       </jtreg-elements>
     </run-jtreg-tests>