Changeset 35362 in osm for applications/editors/josm/plugins/apache-commons/build.xml

Timestamp:

2020-03-14T17:20:37+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm18916 - Switch to Apache Ivy, add Commons Math (patch by taylor.smock)

File:

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

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="apache-commons" default="dist" basedir=".">
+<project name="apache-commons" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
@@ -11 +11 @@
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.commons.CommonsPlugin"/>
     <property name="plugin.description" value="Provides Apache Commons library components. Not meant to be installed directly by users, but rather as a dependency for other plugins."/>
-    
-        <property name="josm" location="../../core/dist/josm-custom.jar"/>
-        <property name="plugin.dist.dir" value="../../dist"/>
+
     <!--<property name="plugin.requires" value=""/>-->
     <property name="plugin.stage" value="10"/>
@@ -22 +20 @@
     <import file="../build-common.xml"/>
 
-    <!--
-    ***************************************************************
-    ** compile_lang3 - compiles Apache Commons Lang 3 (not UTF-8 !)
-    ***************************************************************
-    -->
-    <target name="compile_lang3" depends="init">
-        <echo message="compiling Apache Commons Lang 3 ... "/>
-        <javac srcdir="src" includes="org/apache/commons/lang3/**" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="ISO-8859-1" />
+    <target name="resolve" description="--> retrieve dependencies with Ivy">
+        <ivy:retrieve/>
     </target>
 
-    <!--
-    **********************************************************
-    ** compile - compiles the source tree
-    **********************************************************
-    -->
-    <target name="compile" depends="compile_lang3">
-        <echo message="compiling sources for ${plugin.jar} ... "/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
-            <exclude name="**/org/apache/commons/lang3/**" />
-            <exclude name="**/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur*.java" />
-            <classpath>
-                <pathelement path="${plugin.build.dir}"/>
-                <path refid="plugin.classpath"/>
-            </classpath>
-        </javac>
-    </target>
-
-        <target name="pre-javadoc">
-        <delete><fileset dir="src" includes="**/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur*.java"/></delete>
-    </target>
+    <target name="dist" depends="resolve,plugin_common.dist"/>
 
 </project>