Ticket #21657: 21657.2.17.1.patch

plugins/build-common.xml

@@ -764 +764 @@
     <target name="ivy-checkdepsupdate" description="Display dependency updates on the console" depends="fetch_dependencies">
         <ivy:checkdepsupdate/>
     </target>
+    <target name="dependency-tree" description="Displays Ivy dependency tree" depends="fetch_dependencies">
+        <ivy:dependencytree/>
+    </target>
 </project>

plugins/geotools/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="geotools" default="dist" basedir=".">
+  <project name="geotools" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
@@ -10 +10 @@
     <property name="plugin.description" value="Provides parts of the GeoTools library for other JOSM plugins. Not meant to be installed directly by users, but rather as a dependency for other plugins."/>
     <property name="plugin.icon" value="images/compass.png"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.requires" value="jts;ejml;apache-commons"/>
+    <property name="plugin.requires" value="ejml;apache-commons;jaxb;jts"/>
     <property name="plugin.stage" value="20"/>
 
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
+    <target name="pre-compile" depends="fetch_dependencies">
+        <!-- include fetch_dependencies task -->
+    </target>
+
         <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
-        <include name="jts.jar"/>
-        <include name="ejml.jar"/>
         <include name="apache-commons.jar"/>
+        <include name="ejml.jar"/>
+        <include name="jaxb.jar"/>
+        <include name="jts.jar"/>
     </fileset>
 
     <target name="merge-geotools-services">

plugins/log4j/ivy.xml

@@ -3 +3 @@
 <ivy-module version="2.0">
     <info organisation="org.openstreetmap.josm.plugins" module="log4j"/>
     <dependencies>
-      <dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.17.0" conf="default->default"/>
-      <dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.17.0" conf="default->default"/>
-      <dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.17.0" conf="default->default"/>
+      <dependency org="org.apache.logging.log4j" name="log4j-api" rev="2.17.1" conf="default->default"/>
+      <dependency org="org.apache.logging.log4j" name="log4j-1.2-api" rev="2.17.1" conf="default->default"/>
+      <dependency org="org.apache.logging.log4j" name="log4j-core" rev="2.17.1" conf="default->default"/>
     </dependencies>
 </ivy-module>