Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 13011)
+++ trunk/build.xml	(revision 13073)
@@ -40,5 +40,5 @@
         <!-- For Java9-specific stuff -->
         <condition property="isJava9">
-            <matches string="${ant.java.version}" pattern="(1.)?9" />
+            <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
         </condition>
         <path id="test.classpath">
@@ -338,5 +338,5 @@
             <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
-            <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
@@ -539,6 +539,5 @@
         </jacoco:report>
     </target>
-    <!-- Proguard does not support Java 9 : http://sourceforge.net/p/proguard/bugs/551/ -->
-    <target name="dist-optimized" depends="dist" unless="isJava9">
+    <target name="dist-optimized" depends="dist">
         <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
         <proguard>
@@ -546,7 +545,5 @@
         -outjars ${dist-optimized.jar}
 
-        -libraryjars ${java.home}/lib/rt.jar
-        -libraryjars ${java.home}/lib/jce.jar
-        -libraryjars ${java.home}/lib/ext/jfxrt.jar
+        -libraryjars ${java.home}/lib
 
         -dontoptimize