Changeset 35898 in osm

Timestamp:

2022-01-25T00:48:53+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20669 - upgrade the GeoTools plugin to 25.0 + convert to ivy (patch by taylor.smock)

Location:

applications/editors/josm/plugins/geotools

Files:

• build.xml (modified) (3 diffs)
• ivy.xml (added)
• ivy_settings.xml (added)
• lib (modified) (1 prop)
• lib/GeographicLib-Java-1.49.jar (deleted)
• lib/commons-beanutils-1.9.2-noclassprop.jar (deleted)
• lib/commons-pool-1.5.4.jar (deleted)
• lib/gt-coverage-22.0-sources.jar (deleted)
• lib/gt-coverage-22.0.jar (deleted)
• lib/gt-coverage-api-22.0-sources.jar (deleted)
• lib/gt-coverage-api-22.0.jar (deleted)
• lib/gt-epsg-extension-22.0-sources.jar (deleted)
• lib/gt-epsg-extension-22.0.jar (deleted)
• lib/gt-epsg-hsql-22.0-sources.jar (deleted)
• lib/gt-epsg-hsql-22.0.jar (deleted)
• lib/gt-geotiff-22.0-sources.jar (deleted)
• lib/gt-geotiff-22.0.jar (deleted)
• lib/gt-main-22.0-sources.jar (deleted)
• lib/gt-main-22.0.jar (deleted)
• lib/gt-metadata-22.0-sources.jar (deleted)
• lib/gt-metadata-22.0.jar (deleted)
• lib/gt-opengis-22.0-sources.jar (deleted)
• lib/gt-opengis-22.0.jar (deleted)
• lib/gt-referencing-22.0-sources.jar (deleted)
• lib/gt-referencing-22.0.jar (deleted)
• lib/gt-shapefile-22.0-sources.jar (deleted)
• lib/gt-shapefile-22.0.jar (deleted)
• lib/hsqldb-2.4.1.jar (deleted)
• lib/imageio-ext-geocore-1.3.2.jar (deleted)
• lib/imageio-ext-streams-1.3.2.jar (deleted)
• lib/imageio-ext-tiff-1.3.2.jar (deleted)
• lib/imageio-ext-utilities-1.3.2.jar (deleted)
• lib/indriya-1.0.jar (deleted)
• lib/jai_codec-1.1.3.jar (deleted)
• lib/jai_core-1.1.3.jar (deleted)
• lib/jai_imageio-1.1.jar (deleted)
• lib/jdom2-2.0.6.jar (deleted)
• lib/jt-colorconvert-1.1.12.jar (deleted)
• lib/jt-contour-1.5.0.jar (deleted)
• lib/jt-iterators-1.1.12.jar (deleted)
• lib/jt-rangelookup-1.5.0.jar (deleted)
• lib/jt-stats-1.1.12.jar (deleted)
• lib/jt-utilities-1.1.12.jar (deleted)
• lib/jt-utils-1.5.0.jar (deleted)
• lib/jt-vectorbin-1.1.12.jar (deleted)
• lib/jt-vectorbinarize-1.5.0.jar (deleted)
• lib/jt-vectorize-1.5.0.jar (deleted)
• lib/jt-warp-1.1.12.jar (deleted)
• lib/jt-zonal-1.1.12.jar (deleted)
• lib/jt-zonalstats-1.5.0.jar (deleted)
• lib/si-quantity-0.7.1.jar (deleted)
• lib/si-units-java8-0.7.1.jar (deleted)
• lib/systems-common-java8-0.7.2.jar (deleted)
• lib/unit-api-1.0.jar (deleted)
• lib/uom-lib-common-1.0.2.jar (deleted)
• lib/uom-se-1.0.8.jar (deleted)

applications/editors/josm/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"/>
@@ -11 +11 @@
     <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"/>
 
@@ -17 +17 @@
     <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="apache-commons.jar"/>
+        <include name="ejml.jar"/>
+        <include name="jaxb.jar"/>
         <include name="jts.jar"/>
-        <include name="ejml.jar"/>
-        <include name="apache-commons.jar"/>
     </fileset>