Index: applications/editors/josm/plugins/build-common.xml
===================================================================
--- applications/editors/josm/plugins/build-common.xml	(revision 36208)
+++ applications/editors/josm/plugins/build-common.xml	(revision 36282)
@@ -17,6 +17,4 @@
     <property name="josm.ivysettings"       location="../../core/ivysettings.xml"/>
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
-    <property name="jmockit.jar"            location="../00_core_test_lib/jmockit.jar"/>
-    <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
     <property name="core.tools.ivy"         location="../00_core_tools/ivy.xml"/>
     <property name="plugin.tools.dir"       location="../00_tools"/>
@@ -553,14 +551,19 @@
         <ivy:settings file="${josm.ivysettings}" id="ivy.core.settings"/>
         <ivy:resolve settingsRef="ivy.core.settings" file="${josm.ivy}" conf="test,jacocoant"/>
+        <!-- The following ivy:retrieve calls are for IDEs without Ivy support; since we don't have sync=true, these may not have the "latest" versions -->
+        <!--
         <ivy:retrieve settingsRef="ivy.core.settings" pattern="../00_core_test_lib/[artifact].[ext]" conf="test"/>
         <ivy:retrieve settingsRef="ivy.core.settings" pattern="../00_core_tools/[conf].[ext]" conf="jacocoant"/>
-        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="../00_core_tools/jacocoant.jar"/>
+        -->
+        <ivy:cachepath settingsRef="ivy.core.settings" pathid=".local.test.classpath" conf="test" />
+        <ivy:cachepath settingsRef="ivy.core.settings" pathid="jacocotest.classpath" conf="test,jacocoant"/>
+        <ivy:cachepath settingsRef="ivy.core.settings" pathid="jmockit.classpath" file="${josm.ivy}" conf="jmockit" transitive="false"/>
+        <ivy:cachepath settingsRef="ivy.core.settings" pathid="jacocoant.classpath" file="${josm.ivy}" conf="jacocoant"/>
+        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${toString:jacocoant.classpath}"/>
         <path id="test.classpath">
             <!-- JMockit must be included before JUnit in the classpath -->
-            <pathelement path="${jmockit.jar}"/>
-            <fileset dir="../00_core_test_lib">
-                <include name="**/*.jar"/>
-                <exclude name="**/jmockit*.jar"/>
-            </fileset>
+            <path refid="jmockit.classpath"/>
+            <path refid="jacocotest.classpath"/>
+            <path refid=".local.test.classpath"/>
             <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">
                 <include name="**/*.jar"/>
@@ -578,5 +581,4 @@
             <pathelement path="${josm}"/>
             <pathelement path="${plugin.jar}"/>
-            <pathelement path="${annotations.jar}"/>
         </path>
     </target>
@@ -619,5 +621,5 @@
                         <jvmarg value="${jacocoagent}" if:set="jacocoagent" />
                         <jvmarg value="-Dfile.encoding=UTF-8"/>
-                        <jvmarg value="-javaagent:${jmockit.jar}"/>
+                        <jvmarg value="-javaagent:${toString:jmockit.classpath}"/>
                         <jvmarg value="-Djunit.jupiter.extensions.autodetection.enabled=true"/>
                         <jvmarg value="-Djunit.jupiter.execution.parallel.enabled=true"/>