Changeset 35524 in osm

Timestamp:

2020-08-22T17:52:24+02:00 (4 years ago)

Author:

simon04

Message:

see #18916 - Use Ivy tasks from build-common.xml

Location:

applications/editors/josm/plugins/apache-commons

Files:

• build.xml (modified) (1 diff)
• ivy.xml (modified) (1 diff)
• ivy_settings.xml (added)

applications/editors/josm/plugins/apache-commons/build.xml

@@ -20 +20 @@
     <import file="../build-common.xml"/>
 
-    <target name="resolve" description="--> retrieve dependencies with Ivy">
-        <ivy:retrieve/>
+    <target name="pre-compile" depends="fetch_dependencies">
+        <!-- include fetch_dependencies task -->
     </target>
 
-    <target name="dist" depends="resolve,plugin_common.dist"/>
-
 </project>

applications/editors/josm/plugins/apache-commons/ivy.xml

@@ -2 +2 @@
 <!-- License: GPL. For details, see LICENSE file. -->
 <ivy-module version="2.0">
-    <info organisation="org.openstreetmap" module="josm"/>
-    <configurations>
-        <conf name="ivy" description="Apache Ivy configuration for self-update"/>
-        <!--  configuration that should be used when specifying dependencies -->
-        <conf name="implementation" description="All libs JOSM uses that plugins should not use"/>
-        <conf name="api" description="All libs that JOSM uses and are available for plugins"/>
-        <conf name="runtimeOnly" description="The libs shipped with JOSM that we do not need during compilation"/>
-        <conf name="provided" description="The libs we need during compilation but not on application start"/>
-        <!--  Meta configuration used in build scripts -->
-        <conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
-        <conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided"/>
-        <conf name="test" description="Libraries only needed for testing" extends="compile,runtime"/>
-    </configurations>
+    <info organisation="org.openstreetmap.josm.plugins" module="apache-commons"/>
     <dependencies>
-        <dependency org="com.github.luben" name="zstd-jni" rev="1.4.4-7" conf="api->default"/>
-        <dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="api->default"/>
-        <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="api->default"/>
-        <dependency org="org.apache.commons" name="commons-imaging" rev="1.0-alpha1" conf="api->default"/>
+        <dependency org="com.github.luben" name="zstd-jni" rev="1.4.4-7" conf="default->default"/>
+        <dependency org="org.apache.commons" name="commons-collections4" rev="4.4" conf="default->default"/>
+        <dependency org="org.apache.commons" name="commons-compress" rev="1.20" conf="default->default"/>
+        <dependency org="org.apache.commons" name="commons-imaging" rev="1.0-alpha1" conf="default->default"/>
         <!-- Apache Commons IO does not use the standard org name -->
-        <dependency org="commons-io" name="commons-io" rev="2.6" conf="api->default"/>
+        <dependency org="commons-io" name="commons-io" rev="2.6" conf="default->default"/>
         <!-- Apache Commons Logging also does not use the standard org name -->
-        <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="api->default"/>
-        <dependency org="org.apache.commons" name="commons-lang3" rev="3.9" conf="api->default"/>
-        <dependency org="org.apache.commons" name="commons-math3" rev="3.6.1" conf="api->default"/>
-        <dependency org="org.apache.commons" name="commons-text" rev="1.8" conf="api->default"/>
-        <dependency org="org.brotli" name="dec" rev="0.1.2" conf="api->default"/>
-        <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>
+        <dependency org="commons-logging" name="commons-logging" rev="1.2" conf="default->default"/>
+        <dependency org="org.apache.commons" name="commons-lang3" rev="3.9" conf="default->default"/>
+        <dependency org="org.apache.commons" name="commons-math3" rev="3.6.1" conf="default->default"/>
+        <dependency org="org.apache.commons" name="commons-text" rev="1.8" conf="default->default"/>
+        <dependency org="org.brotli" name="dec" rev="0.1.2" conf="default->default"/>
+        <dependency org="org.tukaani" name="xz" rev="1.8" conf="default->default"/>
     </dependencies>
 </ivy-module>