Changeset 16165 in josm


Ignore:
Timestamp:
2020-03-17T20:55:53+01:00 (15 months ago)
Author:
simon04
Message:

see #16860 - Resolve PMD using Apache Ivy

Location:
trunk
Files:
8 deleted
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r16163 r16165  
    5959        <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
    6060        <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
    61         <property name="commons-lang3.jar" location="${pmd.dir}/commons-lang3-3.8.1.jar"/>
     61        <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3-3.8.1.jar"/>
    6262        <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
    6363        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
     
    103103            <pathelement path="${commons-lang3.jar}"/>
    104104            <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
    105         </path>
    106         <path id="pmd.classpath">
    107             <fileset dir="${pmd.dir}">
    108                 <include name="*.jar"/>
    109             </fileset>
    110105        </path>
    111106        <path id="processor.path">
     
    974969
    975970    <target name="pmd" depends="init-properties">
     971        <ivy:cachepath pathid="pmd.classpath" conf="pmd"/>
    976972        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
    977973        <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
  • trunk/ivy.xml

    r16158 r16165  
    11<?xml version="1.0" encoding="utf-8"?>
    22<!-- License: GPL. For details, see LICENSE file. -->
    3 <ivy-module version="2.0">
     3<ivy-module version="2.0" xmlns:maven="http://ant.apache.org/ivy/maven">
    44    <info organisation="org.openstreetmap" module="josm"/>
    55    <configurations>
     
    1010        <conf name="runtimeOnly" description="The libs shipped with JOSM that we do not need during compilation"/>
    1111        <conf name="provided" description="The libs we need during compilation but not on application start"/>
     12        <conf name="pmd" description="Everything needed for running PMD"/>
    1213        <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
    1314        <!--  Meta configuration used in build scripts -->
     
    2627        <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.13.0" conf="api->default"/>
    2728        <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.1" conf="api->default"/>
     29        <!-- pmd->default -->
     30        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.20.0" conf="pmd->default"/>
     31        <dependency org="net.sourceforge.pmd" name="pmd-java" rev="6.20.0" conf="pmd->default"/>
     32        <dependency org="net.sourceforge.saxon" name="saxon" rev="9.1.0.8" conf="pmd->default">
     33            <artifact name="saxon" type="jar"/>
     34            <artifact name="saxon" type="jar" maven:classifier="dom"/>
     35        </dependency>
    2836        <!-- sources->sources -->
    2937        <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="sources->sources"/>
Note: See TracChangeset for help on using the changeset viewer.