Skip to content

Commit

Permalink
Use pom.xml for dependencies when ivy.xml is not available
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
tsmock committed Aug 21, 2024
1 parent a94e19c commit 9028c18
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 9028c18

Please sign in to comment.