Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 13491)
+++ /trunk/build.xml	(revision 13492)
@@ -34,5 +34,4 @@
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
         <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
-        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <property name="java.lang.version" value="1.8" />
         <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
@@ -48,4 +47,12 @@
         <condition property="isJava9">
             <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
+        </condition>
+        <!-- For Java10-specific stuff -->
+        <condition property="isJava10">
+            <matches string="${ant.java.version}" pattern="1[0-9]" />
+        </condition>
+        <!-- Disable error_prone 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>
         <path id="test.classpath">