Index: .classpath
===================================================================
--- .classpath	(revision 35359)
+++ .classpath	(working copy)
@@ -13,10 +13,6 @@
 			<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>
Index: .project
===================================================================
--- .project	(revision 35359)
+++ .project	(working copy)
@@ -3,6 +3,7 @@
 	<name>JOSM-apache-commons</name>
 	<comment></comment>
 	<projects>
+		<project>JOSM</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -24,5 +25,6 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>org.apache.ivyde.eclipse.ivynature</nature>
 	</natures>
 </projectDescription>
Index: build.xml
===================================================================
--- build.xml	(revision 35359)
+++ build.xml	(working copy)
@@ -1,5 +1,5 @@
 <?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,7 +10,7 @@
     <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,6 +21,12 @@
     <!-- ** 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 !)
Index: ivy.xml
===================================================================
--- ivy.xml	(nonexistent)
+++ ivy.xml	(working copy)
@@ -0,0 +1,21 @@
+<?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>
Index: lib/zstd-jni-1.3.2-2-javadoc.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/zstd-jni-1.3.2-2-javadoc.jar
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: lib/zstd-jni-1.3.2-2-sources.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/zstd-jni-1.3.2-2-sources.jar
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: lib/zstd-jni-1.3.2-2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/zstd-jni-1.3.2-2.jar
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: src/org/apache/commons
===================================================================
--- src/org/apache/commons	(revision 35359)
+++ src/org/apache/commons	(working copy)

Property changes on: src/org/apache/commons
___________________________________________________________________
Modified: svn:externals
## -1,6 +1,26 ##
+https://github.com/apache/commons-collections/trunk/src/main/java/org/apache/commons/collections4 collections4
+https://github.com/apache/commons-compress/trunk/src/main/java/org/apache/commons/compress compress
+https://github.com/apache/commons-geometry/trunk/commons-geometry-core/src/main/java/org/apache/commons/geometry/core geometry/core
+https://github.com/apache/commons-geometry/trunk/commons-geometry-euclidean/src/main/java/org/apache/commons/geometry/euclidean geometry/euclidean
 https://github.com/apache/commons-imaging/trunk/src/main/java/org/apache/commons/imaging imaging
 https://github.com/apache/commons-io/trunk/src/main/java/org/apache/commons/io io
 https://github.com/apache/commons-lang/trunk/src/main/java/org/apache/commons/lang3 lang3
-https://github.com/apache/commons-collections/trunk/src/main/java/org/apache/commons/collections4 collections4
+https://github.com/apache/commons-math/trunk/src/main/java/org/apache/commons/math4 math4
+https://github.com/apache/commons-numbers/trunk/commons-numbers-angle/src/main/java/org/apache/commons/numbers/angle numbers/angle
+https://github.com/apache/commons-numbers/trunk/commons-numbers-arrays/src/main/java/org/apache/commons/numbers/arrays numbers/arrays
+https://github.com/apache/commons-numbers/trunk/commons-numbers-combinatorics/src/main/java/org/apache/commons/numbers/combinatorics numbers/combinatorics
+https://github.com/apache/commons-numbers/trunk/commons-numbers-complex/src/main/java/org/apache/commons/numbers/complex numbers/complex
+https://github.com/apache/commons-numbers/trunk/commons-numbers-complex-streams/src/main/java/org/apache/commons/numbers/complex/streams numbers/complex/streams
+https://github.com/apache/commons-numbers/trunk/commons-numbers-core/src/main/java/org/apache/commons/numbers/core numbers/core
+https://github.com/apache/commons-numbers/trunk/commons-numbers-field/src/main/java/org/apache/commons/numbers/field numbers/field
+https://github.com/apache/commons-numbers/trunk/commons-numbers-fraction/src/main/java/org/apache/commons/numbers/fraction numbers/fraction
+https://github.com/apache/commons-numbers/trunk/commons-numbers-gamma/src/main/java/org/apache/commons/numbers/gamma numbers/gamma
+https://github.com/apache/commons-numbers/trunk/commons-numbers-quaternion/src/main/java/org/apache/commons/numbers/quaternion numbers/quaternion
+https://github.com/apache/commons-numbers/trunk/commons-numbers-rootfinder/src/main/java/org/apache/commons/numbers/rootfinder numbers/rootfinder
+https://github.com/apache/commons-rng/trunk/commons-rng-client-api/src/main/java/org/apache/commons/rng rng
+https://github.com/apache/commons-rng/trunk/commons-rng-core/src/main/java/org/apache/commons/rng/core rng/core
+https://github.com/apache/commons-rng/trunk/commons-rng-sampling/src/main/java/org/apache/commons/rng/sampling rng/sampling
+https://github.com/apache/commons-rng/trunk/commons-rng-simple/src/main/java/org/apache/commons/rng/simple rng/simple
+https://github.com/apache/commons-statistics/trunk/commons-statistics-distribution/src/main/java/org/apache/commons/statistics/distribution statistics/distribution
 https://github.com/apache/commons-text/trunk/src/main/java/org/apache/commons/text text
-https://github.com/apache/commons-compress/trunk/src/main/java/org/apache/commons/compress compress
+