--- jsr166/build.xml	2018/11/21 21:05:59	1.286
+++ jsr166/build.xml	2018/12/02 22:40:03	1.289
@@ -486,6 +486,7 @@
       <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}"/>
@@ -1373,16 +1374,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"/>
-  <property name="errorprone.processorpath" value="${errorprone.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
@@ -1391,6 +1401,7 @@
                    -Xep:LongLiteralLowerCaseSuffix:ERROR
                    -Xep:RedundantThrows:ERROR
                    -Xep:IdentityBinaryExpression:WARN
+                   -Xep:ConstructorInvokesOverridable:WARN
                    -Xep:MethodCanBeStatic:WARN
                    ${errorprone.jsr166.user.flags}"/>
   <!-- -Xep:WildcardImport:ERROR -->
@@ -1423,7 +1434,8 @@
       <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
       <compilerarg value="-J--illegal-access=permit"/>
       <compilerarg value="-XDcompilePolicy=simple"/>
-      <compilerarg line="-processorpath ${errorprone.processorpath}"/>
+      <compilerarg value="-processorpath"/>
+      <compilerarg pathref="errorprone.processorpath.path"/>
       <compilerarg value="-Xplugin:ErrorProne
                           ${errorprone.jsr166.flags}"/>
       <compilerarg value="--patch-module=java.base=${src.dir}"/>