--- jsr166/build.xml	2017/12/18 21:07:18	1.259
+++ jsr166/build.xml	2018/01/23 06:09:53	1.263
@@ -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"/>
@@ -191,6 +195,7 @@
   <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/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}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
@@ -200,6 +205,7 @@
   <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 -->
@@ -299,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"/>
@@ -603,7 +615,7 @@
 
 <!--   </target> -->
 
-  <target name="test910"
+  <target name="test91011"
           description="Runs tck and jtreg tests for src/main for multiple java versions">
 
     <antcall target="clean"/>
@@ -616,6 +628,11 @@
       <param name="build.main.java.version" value="10"/>
     </antcall>
 
+    <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"/>
 
@@ -1383,7 +1400,27 @@
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
 =================================================================== -->
-  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+  <property name="errorprone.jsr166.flags"
+            value="-Xep:HashtableContains:OFF
+                   -Xep:JdkObsolete:OFF
+                   -Xep:MissingOverride:OFF
+                   -Xep:MissingFail:OFF
+                   -Xep:MixedArrayDimensions:ERROR
+                   -Xep:RemoveUnusedImports:ERROR
+                   -Xep:EmptyIf:ERROR
+                   -Xep:MultipleTopLevelClasses:ERROR
+                   -Xep:ClassName:ERROR
+                   -Xep:LongLiteralLowerCaseSuffix:ERROR
+                   -Xep:RedundantThrows:ERROR
+                   -Xep:IdentityBinaryExpression:WARN
+                   -Xep:MethodCanBeStatic:WARN"/>
+  <!-- -Xep:WildcardImport:ERROR -->
+  <property name="errorprone.jsr166.test.flags"
+            value="-Xep:StringSplitter:OFF
+                   -Xep:BoxedPrimitiveConstructor:OFF
+                   -Xep:ModifyingCollectionWithItself:OFF"/>
+  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
   <target name="errorprone"
           depends="clean, configure-compiler"
           description="Run errorprone over jsr166 source code (experimental)">
@@ -1407,16 +1444,7 @@
       <include name="**/*.java"/>
       <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
-                          -Xep:IdentityBinaryExpression:WARN
-                          -Xep:MissingOverride:OFF
-                          -Xep:MixedArrayDimensions:ERROR
-                          -Xep:RemoveUnusedImports:ERROR
-                          -Xep:ClassName:ERROR
-                          -Xep:MultipleTopLevelClasses:ERROR
-                          -Xep:EmptyIf:ERROR
-                          -Xep:LongLiteralLowerCaseSuffix: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"/>
@@ -1437,27 +1465,15 @@
       <javac-elements>
         <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:MissingFail:OFF
-                            -Xep:JdkObsolete:OFF
-                            -Xep:MixedArrayDimensions:ERROR
-                            -Xep:RemoveUnusedImports:ERROR
-                            -Xep:ClassName:ERROR
-                            -Xep:MultipleTopLevelClasses:ERROR
-                            -Xep:EmptyIf:ERROR
-                            -Xep:LongLiteralLowerCaseSuffix: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 errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
   <target name="errorprone-jtreg"
           depends="jar"
           description="Run errorprone over jtreg tests (experimental)">
@@ -1468,24 +1484,13 @@
        classes="${product.jar}"
        verbose="all">
       <jtreg-elements>
+        <arg value="-javacoption:-XDcompilePolicy=byfile"/>
         <arg value="-javacoption:-processorpath"/>
         <arg value="-javacoption:${errorprone.jar}"/>
         <arg value="-javacoption:-Xplugin:ErrorProne
-                            -Xep:IdentityBinaryExpression:WARN
-                            -Xep:BoxedPrimitiveConstructor:OFF
-                            -Xep:HashtableContains:OFF
-                            -Xep:ModifyingCollectionWithItself:OFF
-                            -Xep:MissingOverride:OFF
-                            -Xep:JdkObsolete:OFF
-                            -Xep:NonAtomicVolatileUpdate:OFF
-                            -Xep:MixedArrayDimensions:ERROR
-                            -Xep:RemoveUnusedImports:ERROR
-                            -Xep:ClassName:ERROR
-                            -Xep:MultipleTopLevelClasses:ERROR
-                            -Xep:EmptyIf:ERROR
-                            -Xep:LongLiteralLowerCaseSuffix:ERROR
-                            -Xep:RedundantThrows:ERROR
-                            -Xep:MethodCanBeStatic:WARN"/>
+                            ${errorprone.jsr166.flags}
+                            ${errorprone.jsr166.test.flags}
+                            -Xep:NonAtomicVolatileUpdate:OFF"/>
       </jtreg-elements>
     </run-jtreg-tests>
   </target>