Changeset 16169 in josm for trunk/build.xml

Timestamp:

2020-03-17T22:41:28+01:00 (4 years ago)

Author:

simon04

Message:

see #16860 - Resolve ProGuard using Apache Ivy

File:

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

trunk/build.xml

@@ -609 +609 @@
     </target>
     <target name="dist-optimized" depends="dist" unless="isJava11">
-        <taskdef resource="proguard/ant/task.properties" classpath="${tools.dir}/proguard.jar"/>
+        <ivy:cachepath file="${tools.ivy}" pathid="proguard.classpath" conf="proguard"/>
+        <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
         <proguard>
         -injars ${dist.jar}
@@ -951 +952 @@
     <target name="spotbugs" depends="dist">
         <ivy:cachepath file="${tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
-        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="spotbugs.classpath"/>
         <spotbugs output="xml"
                 outputFile="spotbugs-josm.xml"
@@ -967 +968 @@
     <target name="pmd" depends="init-properties">
         <ivy:cachepath file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
-        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
+        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpathref="pmd.classpath"/>
         <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
             <sourceLanguage name="java" version="${java.lang.version}" />