Changeset 35411 in osm for applications/editors/josm/plugins/build-common.xml

Timestamp:

2020-04-05T20:36:24+02:00 (4 years ago)

Author:

donvip

Message:

see #josm16860 - resolve test libraries using Ivy

File:

• applications/editors/josm/plugins/build-common.xml (modified) (4 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -14 +14 @@
 
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+    <property name="josm.ivy"               location="../../core/ivy.xml"/>
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
     <property name="jmockit.jar"            location="../00_core_test_lib/jmockit.jar"/>
@@ -531 +532 @@
     </target>
 
-    <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>
-        <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">
-            <include name="**/*.jar"/>
-            <exclude name="**/*-sources.jar"/>
-            <exclude name="**/*-javadoc.jar"/>
-        </fileset>
-        <fileset dir="lib" erroronmissingdir="no">
-            <include name="**/*.jar"/>
-            <exclude name="**/*-sources.jar"/>
-            <exclude name="**/*-javadoc.jar"/>
-        </fileset>
-        <pathelement path="${plugin.resources.dir}"/>
-        <pathelement path="${plugin.test.dir}/data"/>
-        <pathelement path="${josm.test.build.dir}/unit"/>
-        <pathelement path="${josm}"/>
-        <pathelement path="${plugin.jar}"/>
-        <pathelement path="${annotations.jar}"/>
-    </path>
     <macrodef name="init-test-preferences">
         <sequential>
@@ -570 +547 @@
         <mkdir dir="${plugin.test.dir}/report"/>
         <init-test-preferences/>
+        <ivy:retrieve pattern="../00_core_test_lib/[artifact].[ext]" conf="test"/>
+        <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>
+            <fileset dir="${plugin.test.dir}/lib" erroronmissingdir="no">
+                <include name="**/*.jar"/>
+                <exclude name="**/*-sources.jar"/>
+                <exclude name="**/*-javadoc.jar"/>
+            </fileset>
+            <fileset dir="lib" erroronmissingdir="no">
+                <include name="**/*.jar"/>
+                <exclude name="**/*-sources.jar"/>
+                <exclude name="**/*-javadoc.jar"/>
+            </fileset>
+            <pathelement path="${plugin.resources.dir}"/>
+            <pathelement path="${plugin.test.dir}/data"/>
+            <pathelement path="${josm.test.build.dir}/unit"/>
+            <pathelement path="${josm}"/>
+            <pathelement path="${plugin.jar}"/>
+            <pathelement path="${annotations.jar}"/>
+        </path>
     </target>
     <target name="test-clean">
@@ -593 +595 @@
     <target name="test" depends="dist, test-clean, test-compile" if="test.present"
         description="Run unit tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
+        <ivy:retrieve file="${josm.ivy}" 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" />
         <sequential>