Ticket #20669: 20669.patch

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">

new file plugins/geotools/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.josm.plugins" module="geotools"/>
+    <dependencies>
+        <dependency org="org.geotools" name="gt-coverage" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-coverage-api" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-epsg-extension" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-epsg-hsql" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-geotiff" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-main" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-metadata" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-opengis" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-referencing" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-shapefile" rev="${gt.version}" conf="default->default"/>
+        <!-- Dependencies that were not needed in 22.0 (according to lib in svn) -->
+        <exclude org="org.geotools" module="gt-imagemosaic"/>
+        <!-- unnecessary dependencies -->
+        <exclude org="com.github.spotbugs"/>
+        <exclude org="org.geotools.demo"/>
+        <!-- from jaxb plugin -->
+        <exclude org="javax.xml.bind" module="jaxb-api" />
+        <exclude org="javax.xml.bind" module="jaxb-runtime" />
+        <!-- from ejml plugin -->
+        <exclude org="org.ejml"/>
+        <!-- from jts plugin -->
+        <exclude org="org.locationtech.jts" module="jts-core"/>
+        <exclude org="org.locationtech.jts.io" module="jts-io-common"/>
+        <!-- from apache-commons plugin -->
+        <exclude org="com.github.luben" module="zstd-jni"/>
+        <exclude org="org.apache.commons" module="commons-collections4"/>
+        <exclude org="org.apache.commons" module="commons-compress"/>
+        <exclude org="org.apache.commons" module="commons-imaging"/>
+        <exclude org="commons-io" module="commons-io"/>
+        <exclude org="commons-logging" module="commons-logging"/>
+        <exclude org="org.apache.commons" module="commons-lang3"/>
+        <exclude org="org.apache.commons" module="commons-math3"/>
+        <exclude org="org.apache.commons" module="commons-text"/>
+        <exclude org="org.brotli" module="dec"/>
+        <exclude org="org.tukaani" module="xz"/>
+    </dependencies>
+</ivy-module>

new file plugins/geotools/ivy_settings.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ivysettings>
+  <include file="../../core/ivysettings.xml"/>
+  <property name="gt.version" value="26.1"/>
+  <settings defaultResolver="ordered-resolvers"/>
+  <resolvers>
+    <chain name="ordered-resolvers">
+      <resolver ref="josm-nexus"/>
+      <ibiblio name="osgeo" m2compatible="true" root="https://repo.osgeo.org/repository/release/" />
+      <ibiblio name="central" m2compatible="true" root="https://repo1.maven.org/maven2/" />
+    </chain>
+  </resolvers>
+</ivysettings>
+