Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 16197)
+++ trunk/build.xml	(revision 16229)
@@ -68,5 +68,4 @@
         <property name="javacutil.jar" location="${tools.dir}/javacutil.jar"/>
         <property name="failureaccess.jar" location="${tools.dir}/failureaccess.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,14 +102,4 @@
             <isset property="isJava9"/>
         </condition>
-        <path id="test.classpath">
-            <fileset dir="${test.dir}/lib">
-                <include name="**/*.jar"/>
-            </fileset>
-            <pathelement path="${build.dir}"/>
-            <pathelement path="${resources.dir}"/>
-            <pathelement path="${failureaccess.jar}"/>
-            <pathelement path="${commons-lang3.jar}"/>
-            <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
-        </path>
         <path id="processor.path">
             <pathelement location="${error_prone_core.jar}"/>
@@ -400,4 +389,11 @@
         <init-test-preferences testfamily="functional"/>
         <init-test-preferences testfamily="performance"/>
+        <path id="test.classpath">
+            <path refid="test.path"/>
+            <pathelement path="${build.dir}"/>
+            <pathelement path="${resources.dir}"/>
+        </path>
+    	<ivy:retrieve pattern="${test.dir}/lib/[artifact].[ext]" conf="jmockit"/>
+    	<ivy:retrieve pattern="${tools.dir}/[conf].[ext]" conf="jacocoant"/>
         <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${tools.dir}/jacocoant.jar" />
     </target>
@@ -922,9 +918,9 @@
                 pluginList=""
                 excludeFilter="${spotbugs.dir}/josm-filter.xml"
-        	    onlyAnalyze="org.openstreetmap.josm.-"
+                onlyAnalyze="org.openstreetmap.josm.-"
                 effort="max"
                 reportLevel="low"
                 >
-        	<class location="${dist.jar}" />
+            <class location="${dist.jar}" />
         </spotbugs>
     </target>
@@ -1146,8 +1142,12 @@
     <target name="bootstrap-workspace" description="Copy libraries from ivy cache to workspace folders for IDE" depends="resolve">
         <delete dir="${lib.dir}"/>
-        <ivy:retrieve pattern="${lib.dir}/compile/[artifact]-[type].[ext]" conf="compile"/>
-        <ivy:retrieve pattern="${lib.dir}/runtime/[artifact]-[type].[ext]" conf="runtime"/>
-        <ivy:retrieve pattern="${lib.dir}/sources/[artifact]-[type].[ext]" conf="sources"/>
-        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle" file="${tools.ivy}"/>
+        <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact]-[type].[ext]" conf="compile,runtime,sources,test"/>
+        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc,checkstyle,pmd,spotbugs" file="${tools.ivy}"/>
+    </target>
+    <target name="api-dependency-tree" description="Displays Ivy dependency tree for JOSM API" depends="resolve">
+        <ivy:dependencytree conf="api"/>
+    </target>
+    <target name="test-dependency-tree" description="Displays Ivy dependency tree for JOSM tests" depends="resolve">
+        <ivy:dependencytree conf="test"/>
     </target>
 </project>