Fix error_prone version issue and dependency updates (see #23218)

Plugins with an ivy_settings.xml file were not reading the error_prone version from the core ivysettings.xml file. This removes redundant ivy_settings.xml files and includes the core ivysettings.xml file in the remaining ivy_settings.xml files. Dependency updates: apache-commons: * zstd-jni: 1.5.2-5 -> 1.5.5-6 * commons-compress: 1.22 -> 1.24.0 * commons-io: 2.11.0 -> 2.14.0 * commons-lang3: 3.12.0 -> 3.13.0 apache-http: * httpclient5: 5.1.2 -> 5.2.1 * Drops legacy httpcore, httpclient, and httpmime dependencies ejml: 0.41 -> 0.43.1 * ejml now requires Java 11 flatlaf: 3.2 -> 3.2.2 geotools: 28.2 -> 30.0 * geotools now requires Java 11 * 30.0 had some breaking API changes, but provided a migration script jackson: 2.14.0 -> 2.15.3 jna: 5.12.1 -> 5.13.0 log4j: 2.19.0 -> 2.21.0 lwjgl: 3.3.1 -> 3.3.3 pbf: * protobuf-java: 3.20.3 -> 3.24.4 git-svn-id: https://josm.openstreetmap.de/osmsvn/applications/editors/josm/plugins@36176 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
JOSM · Oct 19, 2023 · 1d92d38 · 1d92d38
1 parent ead3dd2
commit 1d92d38
Show file tree

Hide file tree

Showing 59 changed files with 1,299 additions and 1,303 deletions.
diff --git a/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java b/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java
@@ -19,11 +19,11 @@
 import javax.swing.ImageIcon;
 
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.geotools.geometry.Envelope2D;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
@@ -56,7 +56,7 @@ public class ImageLayer extends Layer {
     private double angle;
 
     // current bbox
-    private Envelope2D bbox;
+    private ReferencedEnvelope bbox;
 
     // Layer icon
     private Icon layericon;
@@ -143,8 +143,8 @@ private BufferedImage createImage() throws IOException {
         }
         Logging.debug("ImportImagePlugin ImageLayer: Coverage created: {0}", coverage);
 
-        upperLeft = new EastNorth(coverage.getEnvelope2D().x,
-                coverage.getEnvelope2D().y + coverage.getEnvelope2D().height);
+        upperLeft = new EastNorth(coverage.getEnvelope2D().getMinX(),
+                coverage.getEnvelope2D().getMaxY());
         angle = 0;
         bbox = coverage.getEnvelope2D();
 
@@ -229,7 +229,7 @@ public void paint(Graphics2D g2, MapView mv, Bounds bounds) {
         }
     }
 
-    public Envelope2D getBbox() {
+    public ReferencedEnvelope getBbox() {
         return bbox;
     }
 
@@ -300,9 +300,7 @@ void resample(CoordinateReferenceSystem refSys) throws IOException, FactoryExcep
         this.bbox = coverage.getEnvelope2D();
         this.image = ((PlanarImage) coverage.getRenderedImage()).getAsBufferedImage();
 
-        upperLeft = new EastNorth(coverage.getEnvelope2D().x, coverage
-                .getEnvelope2D().y
-                + coverage.getEnvelope2D().height);
+        upperLeft = new EastNorth(coverage.getEnvelope2D().getMinX(), coverage.getEnvelope2D().getMaxY());
         angle = 0;
 
         // repaint and zoom to new bbox

diff --git a/...agePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java b/...agePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LayerPropertiesDialog.java
@@ -30,8 +30,8 @@
 import javax.swing.event.ListSelectionListener;
 
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
 import org.openstreetmap.josm.tools.Logging;
 
 /**

diff --git a/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java b/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java
@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.ImportImagePlugin;
 
-import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
 import java.io.File;
@@ -16,20 +15,20 @@
 
 import javax.imageio.ImageIO;
 
+import org.geotools.api.data.DataSourceException;
+import org.geotools.api.parameter.ParameterValueGroup;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CRSAuthorityFactory;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.util.InternationalString;
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.coverage.grid.GridCoverageFactory;
 import org.geotools.coverage.processing.CoverageProcessor;
-import org.geotools.data.DataSourceException;
 import org.geotools.data.WorldFileReader;
 import org.geotools.gce.geotiff.GeoTiffReader;
-import org.geotools.geometry.Envelope2D;
+import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.referencing.CRS;
 import org.geotools.util.factory.Hints;
-import org.opengis.parameter.ParameterValueGroup;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CRSAuthorityFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.InternationalString;
 import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -152,7 +151,7 @@ public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSy
             double height = img.getHeight() * (-tfwReader.getYPixelSize());
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
         } else if (".jpg".equalsIgnoreCase(extension)
@@ -184,7 +183,7 @@ public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSy
             double height = img.getHeight() * (-tfwReader.getYPixelSize());
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
         } else if (".bmp".equalsIgnoreCase(extension)) {
@@ -215,7 +214,7 @@ public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSy
             double height = img.getHeight() * (-tfwReader.getYPixelSize());
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
         } else if (".png".equalsIgnoreCase(extension)) {
@@ -247,7 +246,7 @@ public static GridCoverage2D createGridFromFile(File file, CoordinateReferenceSy
             double height = img.getHeight() * (-tfwReader.getYPixelSize());
             double lowerLeft_x = tfwReader.getXULC();
             double lowerLeft_y = tfwReader.getYULC() - height;
-            Envelope2D bbox = new Envelope2D(null, new Rectangle2D.Double(lowerLeft_x, lowerLeft_y, width, height));
+            ReferencedEnvelope bbox = ReferencedEnvelope.rect(lowerLeft_x, lowerLeft_y, width, height, null);
             coverage = createGridCoverage(img, bbox, refSys);
 
         } else {
@@ -292,7 +291,7 @@ public static CoordinateReferenceSystem readPrjFile(File file) throws IOExceptio
     /**
      * Method for external use.
      */
-    public static GridCoverage2D createGridCoverage(BufferedImage img, Envelope2D bbox, CoordinateReferenceSystem crs) {
+    public static GridCoverage2D createGridCoverage(BufferedImage img, ReferencedEnvelope bbox, CoordinateReferenceSystem crs) {
         bbox.setCoordinateReferenceSystem(crs);
         return new GridCoverageFactory().create("", img, bbox);
     }

diff --git a/MicrosoftStreetside/ivy.xml b/MicrosoftStreetside/ivy.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <ivy-module xmlns:m="http://ant.apache.org/ivy/maven" version="2.0">
   <info organisation="org.openstreetmap.josm.plugins" module="MicrosoftStreetside" revision="0.0.1"/>
-  <configurations defaultconf="default" defaultconfmapping="default-&gt;default">
+  <configurations defaultconf="default" defaultconfmapping="default->default">
     <conf name="default"/>
     <conf name="provided" description="Needed for compile, but will be present at runtime"/>
   </configurations>
   <dependencies>
-    <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.12.4" conf="default-&gt;default"/>
-    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.12.4" conf="default-&gt;default"/>
-    <dependency org="us.monoid.web" name="resty" rev="0.3.2" conf="default-&gt;default"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.15.3" conf="default->default"/>
+    <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.15.3" conf="default->default"/>
+    <dependency org="us.monoid.web" name="resty" rev="0.3.2" conf="default->default"/>
     <dependency org="org.openjfx" name="javafx-swing" rev="19" conf="provided">
       <artifact name="javafx-swing" type="jar" m:classifier="linux"/>
       <artifact name="javafx-swing" type="jar" m:classifier="mac"/>

diff --git a/MicrosoftStreetside/ivy_settings.xml b/MicrosoftStreetside/ivy_settings.xml
diff --git a/OsmInspectorPlugin/REVISION b/OsmInspectorPlugin/REVISION
diff --git a/OsmInspectorPlugin/build.xml b/OsmInspectorPlugin/build.xml
@@ -12,11 +12,16 @@
     <property name="plugin.icon" value="images/osmInspector.jpg"/>
     <!--<property name="plugin.link" value=""/>-->
     <property name="plugin.requires" value="jts;geotools"/>
+    <property name="plugin.minimum.java.version" value="11"/>
 
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
-	<fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+    <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="geotools.jar"/>
     </fileset>

diff --git a/OsmInspectorPlugin/ivy.xml b/OsmInspectorPlugin/ivy.xml
@@ -0,0 +1,60 @@
+<ivy-module version="2.0">
+    <info organisation="org.openstreetmap.josm.plugins" module="OsmInspector"/>
+    <dependencies>
+        <dependency org="org.geotools" name="gt-app-schema-resolver" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-cql" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-render" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-wfs-ng" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-xml" rev="${gt.version}" conf="default->default"/>
+        <!--
+        <dependency org="org.geotools" name="gt-xsd-core" rev="${gt.version}" conf="default->default"/>
+        <dependency org="org.geotools" name="gt-xsd-wfs" rev="${gt.version}" conf="default->default"/>
+        -->
+
+        <!-- from geotools plugin (effectively copied from geotools ivy.xml, just excluding all geotools dependencies) -->
+        <exclude org="org.geotools" module="gt-coverage" />
+        <exclude org="org.geotools" module="gt-coverage-api" />
+        <exclude org="org.geotools" module="gt-epsg-extension" />
+        <exclude org="org.geotools" module="gt-epsg-hsql" />
+        <exclude org="org.geotools" module="gt-geotiff" />
+        <exclude org="org.geotools" module="gt-main" />
+        <exclude org="org.geotools" module="gt-metadata" />
+        <exclude org="org.geotools" module="gt-api" />
+        <exclude org="org.geotools" module="gt-referencing" />
+        <exclude org="org.geotools" module="gt-shapefile" />
+        <exclude org="org.geotools" module="gt-geopkg" />
+        <!-- Dependencies that were not needed in 22.0 (according to lib in svn) -->
+        <exclude org="org.geotools" module="gt-imagemosaic"/>
+        <exclude org="net.sourceforge.hatbox" module="hatbox"/>
+        <exclude org="com.google.guava" module="guava"/>
+        <!-- unnecessary dependencies -->
+        <exclude org="com.github.spotbugs"/>
+        <exclude org="org.geotools.demo"/>
+        <!-- ecore is rather large (1.3M) -->
+        <exclude org="org.eclipse.emf"/>
+        <!-- from jaxb plugin (Eclipse JAXB 2.3.2, at time of writing) JAXB 3.0 uses jakarta.xml.bind/com.sun.xml.bind -->
+        <exclude org="javax.xml.bind" module="jaxb-api" />
+        <exclude org="org.glassfish.jaxb" 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"/>
+        <!-- from jaxb plugin -->
+        <exclude org="javax.activation" module="javax.activation-api"/>
+        <!-- from jackson plugin -->
+        <exclude org="com.fasterxml.jackson.core" module="jackson-core"/>
+    </dependencies>
+</ivy-module>
diff --git a/OsmInspectorPlugin/ivy_settings.xml b/OsmInspectorPlugin/ivy_settings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ivysettings>
+  <include file="../geotools/ivy_settings.xml" />
+</ivysettings>
+
diff --git a/OsmInspectorPlugin/lib/commons-collections-3.2.2.jar b/OsmInspectorPlugin/lib/commons-collections-3.2.2.jar
diff --git a/OsmInspectorPlugin/lib/commons-jxpath-1.3.jar b/OsmInspectorPlugin/lib/commons-jxpath-1.3.jar
diff --git a/OsmInspectorPlugin/lib/gt-app-schema-resolver-22.0.jar b/OsmInspectorPlugin/lib/gt-app-schema-resolver-22.0.jar
diff --git a/OsmInspectorPlugin/lib/gt-cql-22.0.jar b/OsmInspectorPlugin/lib/gt-cql-22.0.jar
diff --git a/OsmInspectorPlugin/lib/gt-render-22.0.jar b/OsmInspectorPlugin/lib/gt-render-22.0.jar
diff --git a/OsmInspectorPlugin/lib/gt-wfs-ng-22.0.jar b/OsmInspectorPlugin/lib/gt-wfs-ng-22.0.jar
diff --git a/OsmInspectorPlugin/lib/gt-xml-22.0.jar b/OsmInspectorPlugin/lib/gt-xml-22.0.jar
diff --git a/OsmInspectorPlugin/lib/gt-xsd-core-22.0.jar b/OsmInspectorPlugin/lib/gt-xsd-core-22.0.jar
diff --git a/OsmInspectorPlugin/lib/gt-xsd-wfs-22.0.jar b/OsmInspectorPlugin/lib/gt-xsd-wfs-22.0.jar