Changeset 10628 in josm for trunk

Timestamp:

2016-07-24T15:31:31+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472 - error-prone causes problems with coverity and java 9, introduce an ant property to override it

File:

• trunk/build.xml (modified) (3 diffs)

trunk/build.xml

@@ -27 +27 @@
         <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.7.jar"/>
         <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.11.jar"/>
+        <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
         <!-- build parameter: compression level (ant -Dclevel=N)
                  N ranges from 0 (no compression) to 9 (maximum compression)
@@ -245 +246 @@
         </javac>
         <!-- JMapViewer -->
-        <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" sourcepath="" srcdir="${src.dir}" 
+        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
             excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
             destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
@@ -266 +267 @@
         </javac>
         <!-- JOSM -->
-        <javac compiler="com.google.errorprone.ErrorProneAntCompilerAdapter" sourcepath="" srcdir="${src.dir}" 
+        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
             excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
             destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">