Changeset 16167 in josm

Timestamp:

2020-03-17T21:38:34+01:00 (5 years ago)

Author:

simon04

Message:

see #16860 - Separate tools/ivy.xml

Location:

trunk

Files:

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

trunk/build.xml

@@ -948 +948 @@
 
     <target name="spotbugs" depends="dist">
-        <ivy:cachepath pathid="spotbugs.classpath" conf="spotbugs"/>
+        <ivy:cachepath file="${tools.dir}/ivy.xml" pathid="spotbugs.classpath" conf="spotbugs"/>
         <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
         <spotbugs output="xml"
@@ -964 +964 @@
 
     <target name="pmd" depends="init-properties">
-        <ivy:cachepath pathid="pmd.classpath" conf="pmd"/>
+        <ivy:cachepath file="${tools.dir}/ivy.xml" 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

@@ -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="spotbugs" description="Everything needed for running SpotBugs"/>
         <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
         <!--  Meta configuration used in build scripts -->
@@ -28 +26 @@
         <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>
-        <!-- spotbugs->default -->
-        <dependency org="com.github.spotbugs" name="spotbugs" rev="3.1.12" conf="spotbugs->default"/>
-        <dependency org="com.github.spotbugs" name="spotbugs-ant" rev="3.1.12" conf="spotbugs->default"/>
         <!-- sources->sources -->
         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="sources->sources"/>