--- jsr166/build.xml	2017/06/16 20:56:47	1.246
+++ jsr166/build.xml	2017/10/22 03:57:51	1.256
@@ -181,15 +181,15 @@
   <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"/>
+  <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"/>
+  <property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
+  <!-- The location of jdk9 early access docs -->
+  <!-- <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="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/"/>
@@ -328,7 +328,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 +348,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>
@@ -372,7 +375,16 @@
   <!-- Main targets -->
 
   <property name="build.main.java.version" value="9"/>
-  <property name="build.main.javac" value="${javac9}"/>
+  <!-- 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}}"/>
+    </sequential>
+  </macrodef>
+  <define-build-main-properties v="${build.main.java.version}"/>
 
   <target name="dists"
           depends="dist, 4jdk8dist"
@@ -385,17 +397,8 @@
           depends="configure-compiler"
           description="Compiles src/main sources to build dir">
 
-    <local name="modules"/>
-    <condition property="modules">
-      <and>
-        <available file="${jdk9.home}/jmods" type="dir"/>
-        <equals arg1="9" arg2="${build.main.java.version}"/>
-      </and>
-    </condition>
-
     <local name="destdir"/>
-    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
-    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
+    <property name="destdir" value="${build.classes.dir}/java.base"/>
 
     <mkdir dir="${destdir}"/>
 
@@ -412,7 +415,7 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
+      <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
@@ -463,7 +466,7 @@
              sourcepath="${src.dir}"
              classpath=""
              source="9"
-             executable="${javadoc9}">
+             executable="${build.main.javadoc}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -597,22 +600,23 @@
 
 <!--   </target> -->
 
-<!--   <target name="test89" -->
-<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
+  <target name="test910"
+          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> -->
+    <!-- Clean up to avoid obscure wrong class file version bugs -->
+    <antcall target="clean"/>
+
+  </target>
 
 
 
@@ -680,7 +684,7 @@
            includeAntRuntime="false"
            includeJavaRuntime="false"
            encoding="ASCII"
-           executable="${javac9}"
+           executable="${build.main.javac}"
            fork="true">
 
       <include name="*.java"/>
@@ -1375,8 +1379,8 @@
 
 <!-- ==============================================================
   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.1.2.jar"/>
   <target name="errorprone"
           depends="clean, configure-compiler"
           description="Run errorprone over jsr166 source code (experimental)">
@@ -1398,26 +1402,16 @@
            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:MixedArrayDimensions:ERROR
                           -Xep:RemoveUnusedImports:ERROR
                           -Xep:ClassName:ERROR
                           -Xep:MultipleTopLevelClasses:ERROR
                           -Xep:EmptyIf:ERROR
                           -Xep:LongLiteralLowerCaseSuffix:ERROR
-                          -Xep:ArgumentParameterSwap:ERROR
                           -Xep:RedundantThrows:ERROR
                           -Xep:MethodCanBeStatic:WARN"/>
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
@@ -1438,29 +1432,21 @@
       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:MissingFail:OFF
+                            -Xep:JdkObsolete:OFF
+                            -Xep:MixedArrayDimensions:ERROR
                             -Xep:RemoveUnusedImports:ERROR
                             -Xep:ClassName:ERROR
                             -Xep:MultipleTopLevelClasses:ERROR
                             -Xep:EmptyIf:ERROR
                             -Xep:LongLiteralLowerCaseSuffix:ERROR
-                            -Xep:ArgumentParameterSwap:ERROR
                             -Xep:RedundantThrows:ERROR
                             -Xep:MethodCanBeStatic:WARN"/>
         <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
@@ -1468,6 +1454,39 @@
     </run-tck-tests>
   </target>
 
+  <!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
+  <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:-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"/>
+      </jtreg-elements>
+    </run-jtreg-tests>
+  </target>
+
 
 <!-- ==============================================================
   Running guava tests against jsr166 code
@@ -1521,8 +1540,8 @@
     <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
          dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
     <junit printsummary="true" showoutput="true" haltonfailure="true"
-           jvm="${java9}" fork="true">
-      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
+           jvm="${build.main.java}" fork="true">
+      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
       <formatter type="brief"/>
       <classpath>
         <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>