see #15560, see #16047 - make error_prone work on Java 10/11. For det…

…ails refer to:

- google/error-prone#860
- google/error-prone#1086

git-svn-id: https://josm.openstreetmap.de/svn/trunk@14109 0c6e7542-c601-0410-84e7-c038aed88b3b

build.xml

@@ -64,7 +64,7 @@
         <condition property="isJava11">
             <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"/>
         </condition>
@@ -332,6 +332,8 @@ Build-Date: ${build.tstamp}
             <compilerclasspath>
                 <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"/>
             <compilerarg value="-Xlint:dep-ann"/>
@@ -348,6 +350,7 @@ Build-Date: ${build.tstamp}
             <compilerarg value="-Xep:CatchAndPrintStackTrace:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <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>
     </target>
@@ -359,6 +362,8 @@ Build-Date: ${build.tstamp}
             <compilerclasspath>
                 <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"/>
             <compilerarg value="-Xlint:dep-ann"/>
@@ -379,6 +384,7 @@ Build-Date: ${build.tstamp}
             <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <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"/>
         </javac>