Changeset 16571 in josm

Timestamp:

2020-06-08T20:35:38+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - Use error_prone javac via ivy:cachepath

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• tools/ivy.xml (modified) (2 diffs)

trunk/build.xml

@@ -64 +64 @@
         <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${resources.dir}/data/projection/custom-epsg"/>
-        <property name="error_prone_javac.jar" location="${tools.dir}/error_prone/javac.jar"/>
         <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3.jar"/>
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
@@ -281 +280 @@
     <target name="compile" depends="init,javacc,compile-cots" unless="compile.notRequired" description="Compiles JOSM">
         <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone.classpath" conf="errorprone"/>
-        <ivy:retrieve log="download-only" file="${tools.ivy}" pattern="${tools.dir}/error_prone/[artifact].[ext]" conf="errorprone"/>
+        <ivy:cachepath log="download-only" file="${tools.ivy}" pathid="errorprone_javac.classpath" conf="errorprone_javac"/>
         <!-- JOSM -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
             excludes="com/**,org/apache/commons/**,**/package-info.java"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
-            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
+            <compilerarg value="-J-Xbootclasspath/p:${toString:errorprone_javac.classpath}" unless:set="isJava9"/>
             <compilerarg line="-XDcompilePolicy=simple"/>
             <compilerarg value="-processorpath"/>

trunk/tools/ivy.xml

@@ -10 +10 @@
         <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
         <conf name="errorprone" description="Everything needed for running error-prone"/>
+        <conf name="errorprone_javac" description="Everything needed for running javac from error-prone"/>
     </configurations>
     <dependencies>
@@ -30 +31 @@
         <!-- errorprone->default -->
         <dependency org="com.google.errorprone" name="error_prone_core" rev="2.4.0" conf="errorprone->default"/>
+        <!-- errorprone->default -->
+        <dependency org="com.google.errorprone" name="javac" rev="9+181-r4173-1" conf="errorprone_javac->default"/>
     </dependencies>
 </ivy-module>