Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 14108)
+++ /trunk/build.xml	(revision 14109)
@@ -65,5 +65,5 @@
             <matches string="${ant.java.version}" pattern="1[1-9]" />
         </condition>
-        <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
+        <!-- error_prone works differently on Java 10+, see https://github.com/google/error-prone/issues/860 -->
         <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
             <isset property="isJava10"/>
@@ -333,4 +333,6 @@
                 <pathelement location="${error_prone_ant.jar}"/>
             </compilerclasspath>
+            <compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
+            <compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -349,4 +351,5 @@
             <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF" compiler="modern"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
@@ -360,4 +363,6 @@
                 <pathelement location="${error_prone_ant.jar}"/>
             </compilerclasspath>
+            <compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
+            <compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
             <compilerarg value="-Xlint:cast"/>
             <compilerarg value="-Xlint:deprecation"/>
@@ -380,4 +385,5 @@
             <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF" compiler="modern"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>