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

Timestamp:

2020-05-20T21:26:14+02:00 (4 years ago)

Author:

simon04

Message:

see #josm16860, see #josm19087 - resolve test libraries using Ivy

File:

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

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

@@ -549 +549 @@
         <init-test-preferences/>
         <ivy:settings file="${josm.ivysettings}" id="ivy.core.settings"/>
-        <ivy:retrieve file="${josm.ivy}" settingsRef="ivy.core.settings" pattern="../00_core_test_lib/[artifact].[ext]" conf="test"/>
+        <ivy:resolve settingsRef="ivy.core.settings" file="${josm.ivy}" conf="test,jacocoant"/>
+        <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"/>
         <path id="test.classpath">
             <!-- JMockit must be included before JUnit in the classpath -->
@@ -597 +600 @@
     <target name="test" depends="dist, test-clean, test-compile" if="test.present" unless="skip-test"
         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>
             <echo message="Running unit tests with JUnit"/>
@@ -745 +746 @@
         <echo>fetching dependencies with ivy</echo>
         <ivy:settings file="ivy_settings.xml" />
+        <ivy:resolve />
         <ivy:retrieve pattern="${plugin.lib.dir}/[artifact]-[revision](-[classifier]).[ext]" conf="default" />
     </target>