Changeset 16229 in josm for trunk/build.xml


Ignore:
Timestamp:
2020-04-04T16:54:07+02:00 (4 years ago)
Author:
Don-vip
Message:

see #16860 - resolve test libraries using Ivy

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1616test_BLOCK_v2.*
        1717validator-*
         18.josm-local

  • trunk/build.xml

    r16197 r16229  
    6868        <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
    6969        <property name="failureaccess.jar" location="${tools.dir}/failureaccess.jar"/>
    70         <property name="commons-lang3.jar" location="${tools.dir}/commons-lang3-3.8.1.jar"/>
    7170        <property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
    7271        <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
    … …  
    103102            <isset property="isJava9"/>
    104103        </condition>
    105         <path id="test.classpath">
    106             <fileset dir="${test.dir}/lib">
    107                 <include name="**/*.jar"/>
    108             </fileset>
    109             <pathelement path="${build.dir}"/>
    110             <pathelement path="${resources.dir}"/>
    111             <pathelement path="${failureaccess.jar}"/>
    112             <pathelement path="${commons-lang3.jar}"/>
    113             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
    114         </path>
    115104        <path id="processor.path">
    116105            <pathelement location="${error_prone_core.jar}"/>
    … …  
    400389        <init-test-preferences testfamily="functional"/>
    401390        <init-test-preferences testfamily="performance"/>
     391        <path id="test.classpath">
     392            <path refid="test.path"/>
     393            <pathelement path="${build.dir}"/>
     394            <pathelement path="${resources.dir}"/>
     395        </path>
     396        <ivy:retrieve pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
     397        <ivy:retrieve pattern="${tools.dir}/[conf].[ext]" conf="jacocoant"/>
    402398        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${tools.dir}/jacocoant.jar" />
    403399    </target>
    … …  
    922918                pluginList=""
    923919                excludeFilter="${spotbugs.dir}/josm-filter.xml"
    924                     onlyAnalyze="org.openstreetmap.josm.-"
     920                onlyAnalyze="org.openstreetmap.josm.-"
    925921                effort="max"
    926922                reportLevel="low"
    927923                >
    928                 <class location="${dist.jar}" />
     924            <class location="${dist.jar}" />
    929925        </spotbugs>
    930926    </target>
    … …  
    11461142    <target name="bootstrap-workspace" description="Copy libraries from ivy cache to workspace folders for IDE" depends="resolve">
    11471143        <delete dir="${lib.dir}"/>
    1148         <ivy:retrieve pattern="${lib.dir}/compile/[artifact]-[type].[ext]" conf="compile"/>
    1149         <ivy:retrieve pattern="${lib.dir}/runtime/[artifact]-[type].[ext]" conf="runtime"/>
    1150         <ivy:retrieve pattern="${lib.dir}/sources/[artifact]-[type].[ext]" conf="sources"/>
    1151         <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle" file="${tools.ivy}"/>
     1144        <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact]-[type].[ext]" conf="compile,runtime,sources,test"/>
     1145        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs" file="${tools.ivy}"/>
     1146    </target>
     1147    <target name="api-dependency-tree" description="Displays Ivy dependency tree for JOSM API" depends="resolve">
     1148        <ivy:dependencytree conf="api"/>
     1149    </target>
     1150    <target name="test-dependency-tree" description="Displays Ivy dependency tree for JOSM tests" depends="resolve">
     1151        <ivy:dependencytree conf="test"/>
    11521152    </target>
    11531153</project>
Note: See TracChangeset for help on using the changeset viewer.