From 9028c184d85804ce3b398c936ebc461a947866a0 Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@meta.com>
Date: Wed, 21 Aug 2024 11:57:21 -0600
Subject: [PATCH] Use pom.xml for dependencies when ivy.xml is not available

This removes ivy.xml from javafx and converts rasterfilters to use maven for
dependency management instead of jars in source control. In addition
rasterfilters dependencies were upgraded to the latest versions.

javafx now requires Java 17 since OpenJFX 21 requires Java 17+.

opendata was upgraded to use jdom2 (see
https://github.com/JOSM/josm-plugins/security/dependabot/2)
---
 build.xml | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/build.xml b/build.xml
index 2d5fb98..74d91c7 100644
--- a/build.xml
+++ b/build.xml
@@ -20,33 +20,7 @@
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
-    <target name="download-maven-artifact-resolver">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get src="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/1.5.1/maven-resolver-ant-tasks-1.5.1-uber.jar"
-             dest="${ivy.jar.dir}/maven-resolver-ant-tasks-uber.jar"
-             usetimestamp="true"/>
-    </target>
-    <target name="init-maven" depends="download-maven-artifact-resolver">
-        <path id="maven.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="maven-resolver-ant-tasks-uber.jar"/>
-        </path>
-        <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="maven.lib.path"/>
-    </target>
-    <target name="fetch-maven-dependencies" depends="init-maven">
-        <mvn:pom file="pom.xml"/>
-        <mvn:resolve>
-            <!-- I wish this stanza wasn't necessary, but the repos aren't read from pom.xml -->
-            <mvn:remoterepos>
-                <mvn:remoterepo id="JOSM-central" url="https://josm.openstreetmap.de/nexus/content/repositories/central/" />
-                <mvn:remoterepo id="JOSM-releases" url="https://josm.openstreetmap.de/nexus/content/repositories/releases/" />
-                <mvn:remoterepo id="JOSM-snapshots" url="https://josm.openstreetmap.de/nexus/content/repositories/snapshots/" />
-                <mvn:remoterepo id="JOSM-osgeo" url="https://josm.openstreetmap.de/nexus/content/repositories/osgeo/" />
-            </mvn:remoterepos>
-            <mvn:files refid="lib.files" dir="lib" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile"/>
-        </mvn:resolve>
-    </target>
-
-    <target name="pre-compile" depends="fetch-maven-dependencies">
+    <target name="pre-compile" depends="fetch_dependencies">
         <!-- include fetch_dependencies task -->
     </target>
 </project>