Changeset 35413 in osm for applications/editors

Timestamp:

2020-04-05T22:06:15+02:00 (5 years ago)

Author:

simon04

Message:

see #josm16860 - resolve test libraries using Ivy settings from core

File:

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

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

@@ -15 +15 @@
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
     <property name="josm.ivy"               location="../../core/ivy.xml"/>
+    <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"/>
@@ -547 +548 @@
         <mkdir dir="${plugin.test.dir}/report"/>
         <init-test-preferences/>
-        <ivy:retrieve file="${josm.ivy}" pattern="../00_core_test_lib/[artifact].[ext]" conf="test"/>
+        <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"/>
         <path id="test.classpath">
             <!-- JMockit must be included before JUnit in the classpath -->