Ticket #18916: 18916.3.patch

.classpath

@@ -13 +13 @@
                         <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/dec-0.1.2-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="lib" path="lib/zstd-jni-1.3.2-2.jar" sourcepath="lib/zstd-jni-1.3.2-2-sources.jar">
-                <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-apache-commons/lib/zstd-jni-1.3.2-2-javadoc.jar!/"/>
-                </attributes>
-        </classpathentry>
+        <classpathentry exported="true" kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM-apache-commons&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

.project

@@ -3 +3 @@
         <name>JOSM-apache-commons</name>
         <comment></comment>
         <projects>
+                <project>JOSM</project>
         </projects>
         <buildSpec>
                 <buildCommand>
@@ -24 +25 @@
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
                 <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+                <nature>org.apache.ivyde.eclipse.ivynature</nature>
         </natures>
 </projectDescription>

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 -->
     <property name="plugin.main.version" value="10580"/>
@@ -10 +10 @@
     <property name="plugin.author" value="nokutu; Don-vip"/>
     <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=""/>-->
@@ -21 +21 @@
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
+    <target name="resolve" description="--> retrieve dependencies with Ivy">
+        <ivy:retrieve/>
+    </target>
+
+    <target name="dist" depends="resolve,plugin_common.dist"/>
+
     <!--
     ***************************************************************
     ** compile_lang3 - compiles Apache Commons Lang 3 (not UTF-8 !)

ivy.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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"/>
+        <conf name="epsg" description="Everything epsg needs- which is currently all of JOSM."/>
+        <!--  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>
+    <dependencies>
+        <dependency org="com.github.luben" name="zstd-jni" rev="1.4.4-7" conf="api->default"/>
+    </dependencies>
+</ivy-module>