--- jsr166/build.xml	2018/01/24 01:11:10	1.264
+++ jsr166/build.xml	2018/10/07 03:56:13	1.281
@@ -1,5 +1,6 @@
 <project name="jsr166" default="usage"
-  xmlns:if="ant:if" xmlns:unless="ant:unless"
+  xmlns:if="ant:if" 
+  xmlns:unless="ant:unless"
   xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <description>
@@ -22,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.
 
@@ -103,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">
@@ -135,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"/>
@@ -146,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"/>
@@ -191,12 +196,17 @@
   <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"/>
   <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
-  <!-- The location of jdk9 early access docs (RIP) -->
+  <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="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
   <!-- Default jdk doc location (latest stable release seems best) -->
-  <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="java.docroot.url"   value="${java9.docroot.url}"/>
+  <!-- But pin to jdk 10 until fix for -->
+  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
+  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -206,6 +216,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 -->
@@ -238,7 +249,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"/>
@@ -305,35 +316,26 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
-  <fileset dir="${jtreg11.src.dir}">
-    <patternset id="jdk11.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg10.src.dir}">
-    <patternset id="jdk10.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg9.src.dir}">
-    <patternset id="jdk9.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
-
-  <fileset dir="${jtreg8.src.dir}">
-    <patternset id="jdk8.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
+  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
+  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
+  <property name="jtreg.test.pattern" value="**/*.java"/>
+  <macrodef name="defjtregtests">
+    <attribute name="v"/>
+    <sequential>
+      <fileset dir="${jtreg@{v}.src.dir}">
+        <patternset id="jdk@{v}.jtreg.tests">
+          <include name="${jtreg.test.pattern}"/>
+        </patternset>
+      </fileset>
+    </sequential>
+  </macrodef>
 
-  <fileset dir="${jtreg7.src.dir}">
-    <patternset id="jdk7.jtreg.tests">
-      <include name="**/*.java"/>
-    </patternset>
-  </fileset>
+  <defjtregtests v="12"/>
+  <defjtregtests v="11"/>
+  <defjtregtests v="10"/>
+  <defjtregtests v="9"/>
+  <defjtregtests v="8"/>
+  <defjtregtests v="7"/>
 
   <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
   <property name="jtreg.flags" value=""/>
@@ -354,7 +356,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"/>
@@ -389,14 +391,20 @@
 
   <!-- 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"/>
     <sequential>
       <property name="build.main.java"    value="${java@{v}}"/>
       <property name="build.main.javac"   value="${javac@{v}}"/>
-      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
+      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
+      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
+      <condition property="build.main.javadoc" 
+                 value="${javadoc12}"
+                 else="${javadoc@{v}}">
+        <matches pattern="^(9|10|11)$" string="@{v}"/>
+      </condition>
     </sequential>
   </macrodef>
   <define-build-main-properties v="${build.main.java.version}"/>
@@ -404,9 +412,7 @@
   <target name="dists"
           depends="dist, 4jdk8dist"
           description="Builds all public jars and docs"/>
-          <!--
-              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
-          -->
+          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
 
   <target name="compile"
           depends="configure-compiler"
@@ -475,35 +481,29 @@
 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${java9.api.url}"
+             link="${java11.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"/>
       <arg value="--patch-module=java.base=${src.dir}"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
-<!-- @apiNote currently unused -->
-<!--       <arg value="-tag"/> -->
-<!--       <arg value="apiNote:a:API Note:"/> -->
-      <arg value="-tag"/>
-      <arg value="implSpec:a:Implementation Requirements:"/>
-      <arg value="-tag"/>
-      <arg value="implNote:a:Implementation Note:"/>
+      <arg value="--override-methods=summary"/>
+      <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:"/>
+      <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"/> -->
+<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
+<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -615,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 -->
@@ -845,15 +864,11 @@
       </fileset>
       <arg line="-Xdocrootparent ${java8.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
-<!-- @apiNote currently unused -->
-<!--       <arg value="-tag"/> -->
-<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
-      <arg value="-tag"/>
-      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
-      <arg value="-tag"/>
-      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
+      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
+<!-- @apiNote tag currently unused -->
+<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
     </javadoc>
   </target>
 
@@ -1383,14 +1398,14 @@
 
 <!-- Find buglets that can be detected by static build tools -->
 
-  <target name="lint">
-    <antcall target="dists">
-      <param name="build.javadoc.access" value="public"/>
-    </antcall>
-  </target>
+<!--   <target name="lint"> -->
+<!--     <antcall target="dists"> -->
+<!--       <param name="build.javadoc.access" value="protected"/> -->
+<!--     </antcall> -->
+<!--   </target> -->
 
 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
-  <target name="lint-private">
+  <target name="doclint-private">
     <antcall target="dist">
       <param name="build.javadoc.access" value="private"/>
     </antcall>
@@ -1398,9 +1413,10 @@
 
 
 <!-- ==============================================================
-  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
                    -Xep:JdkObsolete:OFF
@@ -1414,7 +1430,8 @@
                    -Xep:LongLiteralLowerCaseSuffix:ERROR
                    -Xep:RedundantThrows:ERROR
                    -Xep:IdentityBinaryExpression:WARN
-                   -Xep:MethodCanBeStatic:WARN"/>
+                   -Xep:MethodCanBeStatic:WARN
+                   ${errorprone.jsr166.user.flags}"/>
   <!-- -Xep:WildcardImport:ERROR -->
   <property name="errorprone.jsr166.test.flags"
             value="-Xep:StringSplitter:OFF
@@ -1442,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
@@ -1464,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
@@ -1492,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>