Changeset 16165 in josm for trunk

Timestamp:

2020-03-17T20:55:53+01:00 (4 years ago)

Author:

simon04

Message:

see #16860 - Resolve PMD using Apache Ivy

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• ivy.xml (modified) (3 diffs)
• tools/commons-lang3-3.8.1.jar (moved) (moved from trunk/tools/pmd/commons-lang3-3.8.1.jar )
• tools/pmd/antlr-runtime-3.5.2.jar (deleted)
• tools/pmd/asm-7.1.jar (deleted)
• tools/pmd/commons-io-2.6.jar (deleted)
• tools/pmd/pmd-core-6.20.0.jar (deleted)
• tools/pmd/pmd-java-6.20.0.jar (deleted)
• tools/pmd/pmd-ui-6.19.0.jar (deleted)
• tools/pmd/saxon-9.1.0.8-dom.jar (deleted)
• tools/pmd/saxon-9.1.0.8.jar (deleted)

trunk/build.xml

@@ -59 +59 @@
         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
         <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
-        <property name="commons-lang3.jar" location="${pmd.dir}/commons-lang3-3.8.1.jar"/>
+        <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3-3.8.1.jar"/>
         <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
@@ -103 +103 @@
             <pathelement path="${commons-lang3.jar}"/>
             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
-        </path>
-        <path id="pmd.classpath">
-            <fileset dir="${pmd.dir}">
-                <include name="*.jar"/>
-            </fileset>
         </path>
         <path id="processor.path">
@@ -974 +969 @@
 
     <target name="pmd" depends="init-properties">
+        <ivy:cachepath pathid="pmd.classpath" conf="pmd"/>
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
         <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">

trunk/ivy.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- License: GPL. For details, see LICENSE file. -->
-<ivy-module version="2.0">
+<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
     <info organisation="org.openstreetmap" module="josm"/>
     <configurations>
@@ -10 +10 @@
         <conf name="runtimeOnly" description="The libs shipped with JOSM that we do not need during compilation"/>
         <conf name="provided" description="The libs we need during compilation but not on application start"/>
+        <conf name="pmd" description="Everything needed for running PMD"/>
         <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
         <!--  Meta configuration used in build scripts -->
@@ -26 +27 @@
         <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.13.0" conf="api->default"/>
         <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.1" conf="api->default"/>
+        <!-- pmd->default -->
+        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.20.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.20.0" conf="pmd->default"/>
+        <dependency org="net.sourceforge.saxon" name="saxon" rev="9.1.0.8" conf="pmd->default">
+            <artifact name="saxon" type="jar"/>
+            <artifact name="saxon" type="jar" maven:classifier="dom"/>
+        </dependency>
         <!-- sources->sources -->
         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="sources->sources"/>