--- jsr166/build.xml	2018/10/24 22:31:14	1.283
+++ jsr166/build.xml	2018/12/13 01:12:01	1.292
@@ -1,5 +1,5 @@
 <project name="jsr166" default="usage"
-  xmlns:if="ant:if" 
+  xmlns:if="ant:if"
   xmlns:unless="ant:unless"
   xmlns:ivy="antlib:org.apache.ivy.ant">
 
@@ -55,7 +55,6 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -203,10 +202,8 @@
   <!-- <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) -->
-  <!-- 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}"/>
+  <!-- Default jdk doc location (latest stable LTS release seems best) -->
+  <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/"/>
@@ -341,7 +338,7 @@
   <property name="jtreg.flags" value=""/>
 
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
+    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="target"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
@@ -391,23 +388,20 @@
 
   <!-- Main targets -->
 
-  <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}}"/>
-      <!-- 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}"/>
+  <!-- Default values: may seem strange ... -->
+  <!-- At runtime, target latest LTS, i.e. jdk11 -->
+  <!-- But at build time, target jdk9, for maximal binary portability -->
+  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
+    o override-methods=summary
+    o {@systemProperty ...}
+    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
+    o 8202628: javadoc generates bad links in TestModules.java
+    -->
+  <property name="java.runtime.target" value="11"/>
+  <property name="build.main.java" value="${java11}"/>
+  <property name="build.main.javac" value="${javac9}"/>
+  <property name="build.main.javadoc" value="${javadoc12}"/>
+  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
 
   <target name="dists"
           depends="dist, 4jdk8dist"
@@ -439,7 +433,7 @@
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Xlint:all,-removal"/>
       <compilerarg line="--doclint-format html5"/>
       <compilerarg value="-Xdoclint:all/protected,reference/private"/>
       <compilerarg value="-Werror"/>
@@ -481,21 +475,23 @@
 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${java11.api.url}"
+             link="${java.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${src.dir}"
              classpath=""
-             source="11"
+             source="${build.main.javadoc.source}"
              executable="${build.main.javadoc}">
+<!-- TODO: JDK-8214571 failonerror = "true" -->
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
-      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
+      <arg line="-Xdocrootparent ${java.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}"/>
+<!-- old school frames via docs/index.html?overview-summary.html -->
       <arg value="--frames"/>
       <arg value="--override-methods=summary"/>
       <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
@@ -542,7 +538,7 @@
           description="Runs tck tests for src/main directly">
 
     <run-tck-tests
-      target="${build.main.java.version}"
+      target="${java.runtime.target}"
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
@@ -576,7 +572,7 @@
 	  depends="jar"
           description="Runs jtreg tests for src/main using the jtreg ant task">
     <run-jtreg-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        workdir="${build.dir}"
        classes="${product.jar}"/>
   </target>
@@ -585,57 +581,81 @@
           depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
           description="Runs tck and jtreg tests for src/main"/>
 
-<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
-
-<!--     <antcall target="jtreg"> -->
-<!--       <param name="build.main.java.version" value="8"/> -->
-<!--       <param name="build.main.javac" value="${javac8}"/> -->
-<!--     </antcall> -->
-
-<!--   </target> -->
-
-  <target name="test9101112"
-          description="Runs tck and jtreg tests for src/main for multiple java versions">
+  <target name="test-version-permutations"
+	  depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
+  </target>
 
+  <target name="test9">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="9"/>
-      <param name="build.main.java" value="${java9}"/>
+    <antcall>
+      <param name="java.runtime.target" value="9"/>
       <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test10">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="10"/>
-      <param name="build.main.java" value="${java10}"/>
+    <antcall>
+      <param name="java.runtime.target" value="10"/>
       <param name="build.main.javac" value="${javac10}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="10"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test11">
     <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="11"/>
-      <param name="build.main.java" value="${java11}"/>
+    <antcall>
+      <param name="java.runtime.target" value="11"/>
       <param name="build.main.javac" value="${javac11}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="11"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
+  <target name="test12">
     <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}"/>
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
       <param name="build.main.javac" value="${javac12}"/>
       <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="12"/>
+      <target name="test"/>
+      <target name="docs"/>
     </antcall>
+  </target>
 
-    <!-- Clean up to avoid obscure wrong class file version bugs -->
+  <target name="test9-11">
     <antcall target="clean"/>
-
+    <antcall>
+      <param name="java.runtime.target" value="11"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
   </target>
 
+  <target name="test9-12">
+    <antcall target="clean"/>
+    <antcall>
+      <param name="java.runtime.target" value="12"/>
+      <param name="build.main.javac" value="${javac9}"/>
+      <param name="build.main.javadoc" value="${javadoc12}"/>
+      <param name="build.main.javadoc.source" value="9"/>
+      <target name="test"/>
+      <target name="docs"/>
+    </antcall>
+  </target>
 
 
   <target name="configure-compiler">
@@ -658,37 +678,6 @@
   </target>
 
 
-
-  <!-- Various demos and test programs -->
-
-
-  <!-- description="Benchmark from Doug Lea's AQS paper" -->
-  <target name="loops" depends="configure-compiler">
-
-    <mkdir dir="${build.loops.dir}"/>
-
-    <javac srcdir="${loops.src.dir}"
-          destdir="${build.loops.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-           target="${build.sourcelevel}"
-         encoding="ASCII"
-             fork="true">
-
-      <compilerarg line="${build.args}"/>
-      <classpath refid="loops.classpath"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-
-    </javac>
-
-    <java classname="ALoops" fork="true">
-      <classpath refid="loops.classpath"/>
-    </java>
-  </target>
-
-
   <target name="compile-test-loops" depends="jar"
           description="Compiles all the perf tests in src/test/loops">
 
@@ -1392,15 +1381,25 @@
 
 
 <!-- ==============================================================
-  Experimental errorprone support - https://errorprone.info
+  Experimental errorprone support
+  https://errorprone.info
+  https://errorprone.info/docs/installation
+  https://github.com/google/error-prone/issues/1143
 =================================================================== -->
-  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
+  <path id="errorprone.processorpath.path">
+    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
+    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
+    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
+  </path>
+  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
   <property name="errorprone.jsr166.user.flags" value=""/>
   <property name="errorprone.jsr166.flags"
             value="-Xep:HashtableContains:OFF
                    -Xep:JdkObsolete:OFF
                    -Xep:MissingOverride:OFF
                    -Xep:MissingFail:OFF
+                   -Xep:ThreadPriorityCheck:OFF
                    -Xep:MixedArrayDimensions:ERROR
                    -Xep:RemoveUnusedImports:ERROR
                    -Xep:EmptyIf:ERROR
@@ -1409,6 +1408,7 @@
                    -Xep:LongLiteralLowerCaseSuffix:ERROR
                    -Xep:RedundantThrows:ERROR
                    -Xep:IdentityBinaryExpression:WARN
+                   -Xep:ConstructorInvokesOverridable:WARN
                    -Xep:MethodCanBeStatic:WARN
                    ${errorprone.jsr166.user.flags}"/>
   <!-- -Xep:WildcardImport:ERROR -->
@@ -1441,7 +1441,8 @@
       <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
       <compilerarg value="-J--illegal-access=permit"/>
       <compilerarg value="-XDcompilePolicy=simple"/>
-      <compilerarg line="-processorpath ${errorprone.jar}"/>
+      <compilerarg value="-processorpath"/>
+      <compilerarg pathref="errorprone.processorpath.path"/>
       <compilerarg value="-Xplugin:ErrorProne
                           ${errorprone.jsr166.flags}"/>
       <compilerarg value="--patch-module=java.base=${src.dir}"/>
@@ -1458,14 +1459,14 @@
     </jar>
 
     <run-tck-tests
-      target="${build.main.java.version}"
+      target="${java.runtime.target}"
       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 line="-processorpath ${errorprone.processorpath}"/>
         <compilerarg value="-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
                             ${errorprone.jsr166.test.flags}"/>
@@ -1481,14 +1482,14 @@
           description="Run errorprone over jtreg tests (experimental)">
 
     <run-jtreg-tests
-       target="${build.main.java.version}"
+       target="${java.runtime.target}"
        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:${errorprone.processorpath}"/>
         <arg value="-javacoption:-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
                             ${errorprone.jsr166.test.flags}