Changeset 35379 in osm for applications/editors/josm

Timestamp:

2020-03-17T23:05:26+01:00 (5 years ago)

Author:

simon04

Message:

see #see16860 - Resolve Checkstyle using Apache Ivy

File:

• applications/editors/josm/plugins/build-common.xml (modified) (2 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -23 +23 @@
     <property name="failureaccess.jar"      location="../00_core_tools/failureaccess.jar"/>
     <property name="guava.jar"              location="../00_core_tools/guava.jar"/>
-    <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-all.jar"/>
     <property name="checkstyle-build.dir"   location="../00_core_tools/checkstyle/build"/>
     <property name="jformatstring.jar"      location="../00_core_tools/spotbugs/jFormatString-3.0.0.jar"/>
@@ -632 +631 @@
 
     <target name="checkstyle-compile">
+        <ivy:cachepath file="${core.tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
         <mkdir dir="${checkstyle-build.dir}"/>
         <javac sourcepath="" srcdir="../00_core_tools/checkstyle/src" failonerror="true"
             destdir="${checkstyle-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
             includeantruntime="false" createMissingPackageInfoClass="false"
-            encoding="UTF-8" classpath="${checkstyle.jar}">
+            encoding="UTF-8" classpathref="checkstyle.classpath">
         </javac>
     </target>
     <target name="checkstyle" depends="checkstyle-compile">
-        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" classpath="${checkstyle.jar}:${checkstyle-build.dir}"/>
+        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties">
+            <classpath refid="checkstyle.classpath"/>
+            <classpath path="${checkstyle-build.dir}"/>
+        </taskdef>
         <checkstyle config="${basedir}/../checkstyle-config.xml">
             <fileset dir="${basedir}/src" includes="**/*.java" excludes="boofcv/**/*.java,