--- jsr166/build.xml	2017/06/16 21:30:00	1.247
+++ jsr166/build.xml	2018/01/20 01:54:14	1.261
@@ -21,10 +21,12 @@
   $HOME/jdk/jdk8
   $HOME/jdk/jdk9
   $HOME/jdk/jdk10
+  $HOME/jdk/jdk11
   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
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
 
@@ -132,6 +134,7 @@
   <defjdklocations v="8"/>
   <defjdklocations v="9"/>
   <defjdklocations v="10"/>
+  <defjdklocations v="11"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -142,6 +145,7 @@
   <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
   <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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
@@ -181,15 +185,18 @@
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
-  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
-  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
-  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
-  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
-  <!-- The expected canonical location does not yet exist as of 2016-04 -->
-  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
-  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
+  <!-- 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"/>
+  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
+  <!-- The location of jdk9 early access docs (RIP) -->
+  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
   <!-- Default jdk doc location (latest stable release seems best) -->
-  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
+  <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}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
@@ -197,6 +204,8 @@
   <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
   <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
   <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="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
@@ -296,6 +305,12 @@
   </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"/>
@@ -328,7 +343,9 @@
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
+    <attribute name="verbose" default="${jtreg.verbose}"/>
     <attribute name="jtregflags" default=""/>
+    <element name="jtreg-elements" optional="true"/>
 
     <sequential>
 
@@ -346,16 +363,17 @@
            workDir="@{workdir}/JTwork">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
-      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
+      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
+      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-noreport"/>
-      <arg value="-verbose:${jtreg.verbose}"/>
+      <arg value="-verbose:@{verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
       <arg line="${jtreg.flags}"/>
+      <jtreg-elements/>
     </jtreg>
     </sequential>
   </macrodef>
@@ -597,22 +615,28 @@
 
 <!--   </target> -->
 
-<!--   <target name="test89" -->
-<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
+  <target name="test91011"
+          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="8"/> -->
-<!--       <param name="build.main.javac" value="${javac8}"/> -->
-<!--     </antcall> -->
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="9"/>
+    </antcall>
 
-<!--     <antcall target="clean"/> -->
-<!--     <antcall target="test"> -->
-<!--       <param name="build.main.java.version" value="9"/> -->
-<!--       <param name="build.main.javac" value="${javac9}"/> -->
-<!--     </antcall> -->
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="10"/>
+    </antcall>
 
-<!--   </target> -->
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="11"/>
+    </antcall>
+
+    <!-- Clean up to avoid obscure wrong class file version bugs -->
+    <antcall target="clean"/>
+
+  </target>
 
 
 
@@ -1375,8 +1399,29 @@
 
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
-  You may need to bring your own errorprone jar.
 =================================================================== -->
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+  <property name="errorprone.jsr166.flags"
+            value="-Xep:BoxedPrimitiveConstructor:OFF
+                   -Xep:HashtableContains:OFF
+                   -Xep:JdkObsolete:OFF
+                   -Xep:ModifyingCollectionWithItself:OFF
+                   -Xep:MissingOverride:OFF
+                   -Xep:MissingFail:OFF
+                   -Xep:IdentityBinaryExpression:WARN
+                   -Xep:MethodCanBeStatic:WARN"/>
+  <!-- -Xep:WildcardImport:ERROR -->
+  <property name="errorprone.jsr166.test.flags"
+            value="-Xep:MissingOverride:OFF
+                   -Xep:StringSplitter:OFF
+                   -Xep:MixedArrayDimensions:ERROR
+                   -Xep:RemoveUnusedImports:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:EmptyIf:ERROR
+                   -Xep:MultipleTopLevelClasses:ERROR
+                   -Xep:ClassName:ERROR"/>
+  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
   <target name="errorprone"
           depends="clean, configure-compiler"
           description="Run errorprone over jsr166 source code (experimental)">
@@ -1398,28 +1443,9 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
+      <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
-                          -Xep:IdentityBinaryExpression:WARN
-                          -Xep:MissingOverride:OFF
-                          -Xep:MixedArrayDimensions:WARN
-                          -Xep:RemoveUnusedImports:ERROR
-                          -Xep:ClassName:ERROR
-                          -Xep:MultipleTopLevelClasses:ERROR
-                          -Xep:EmptyIf:ERROR
-                          -Xep:LongLiteralLowerCaseSuffix:ERROR
-                          -Xep:ArgumentParameterSwap:ERROR
-                          -Xep:RedundantThrows:ERROR
-                          -Xep:MethodCanBeStatic:WARN"/>
+                          ${errorprone.jsr166.flags}"/>
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
@@ -1438,36 +1464,38 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
-        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
+        <compilerarg line="-processorpath ${errorprone.jar}"/>
         <compilerarg value="-Xplugin:ErrorProne
-                            -Xep:IdentityBinaryExpression:WARN
-                            -Xep:BoxedPrimitiveConstructor:OFF
-                            -Xep:HashtableContains:OFF
-                            -Xep:ModifyingCollectionWithItself:OFF
-                            -Xep:MissingOverride:OFF
-                            -Xep:MixedArrayDimensions:WARN
-                            -Xep:RemoveUnusedImports:ERROR
-                            -Xep:ClassName:ERROR
-                            -Xep:MultipleTopLevelClasses:ERROR
-                            -Xep:EmptyIf:ERROR
-                            -Xep:LongLiteralLowerCaseSuffix:ERROR
-                            -Xep:ArgumentParameterSwap:ERROR
-                            -Xep:RedundantThrows:ERROR
-                            -Xep:MethodCanBeStatic:WARN"/>
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}"/>
         <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
       </javac-elements>
     </run-tck-tests>
   </target>
 
+  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <!-- -XDcompilePolicy=simple or by-file avoids confusing UnusedImports -->
+  <target name="errorprone-jtreg"
+          depends="jar"
+          description="Run errorprone over jtreg tests (experimental)">
+
+    <run-jtreg-tests
+       target="${build.main.java.version}"
+       workdir="${build.dir}"
+       classes="${product.jar}"
+       verbose="all">
+      <jtreg-elements>
+        <arg value="-javacoption:-XDcompilePolicy=simple"/>
+        <arg value="-javacoption:-processorpath"/>
+        <arg value="-javacoption:${errorprone.jar}"/>
+        <arg value="-javacoption:-Xplugin:ErrorProne
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}
+                            -Xep:NonAtomicVolatileUpdate:OFF"/>
+      </jtreg-elements>
+    </run-jtreg-tests>
+  </target>
+
 
 <!-- ==============================================================
   Running guava tests against jsr166 code
@@ -1522,7 +1550,7 @@
          dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
     <junit printsummary="true" showoutput="true" haltonfailure="true"
            jvm="${build.main.java}" fork="true">
-      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
+      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
       <formatter type="brief"/>
       <classpath>
         <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>