Changeset 16571 in josm


Ignore:
Timestamp:
2020-06-08T20:35:38+02:00 (4 weeks ago)
Author:
simon04
Message:

see #19334 - Use error_prone javac via ivy:cachepath

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r16556 r16571  
    6464        <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
    6565        <property name="epsg.output" location="${resources.dir}/data/projection/custom-epsg"/>
    66         <property name="error_prone_javac.jar" location="${tools.dir}/error_prone/javac.jar"/>
    6766        <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3.jar"/>
    6867        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
     
    281280    <target name="compile" depends="init,javacc,compile-cots" unless="compile.notRequired" description="Compiles JOSM">
    282281        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone.classpath" conf="errorprone"/>
    283         <ivy:retrieve log="download-only" file="${tools.ivy}" pattern="${tools.dir}/error_prone/[artifact].[ext]" conf="errorprone"/>
     282        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone_javac.classpath" conf="errorprone_javac"/>
    284283        <!-- JOSM -->
    285284        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
    286285            excludes="com/**,org/apache/commons/**,**/package-info.java"
    287286            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
    288             <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
     287            <compilerarg value="-J-Xbootclasspath/p:${toString:errorprone_javac.classpath}" unless:set="isJava9"/>
    289288            <compilerarg line="-XDcompilePolicy=simple"/>
    290289            <compilerarg value="-processorpath"/>
  • trunk/tools/ivy.xml

    r16556 r16571  
    1010        <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
    1111        <conf name="errorprone" description="Everything needed for running error-prone"/>
     12        <conf name="errorprone_javac" description="Everything needed for running javac from error-prone"/>
    1213    </configurations>
    1314    <dependencies>
     
    3031        <!-- errorprone->default -->
    3132        <dependency org="com.google.errorprone" name="error_prone_core" rev="2.4.0" conf="errorprone->default"/>
     33        <!-- errorprone->default -->
     34        <dependency org="com.google.errorprone" name="javac" rev="9+181-r4173-1" conf="errorprone_javac->default"/>
    3235    </dependencies>
    3336</ivy-module>
Note: See TracChangeset for help on using the changeset viewer.