Ignore:
Timestamp:
2023-10-19T21:58:56+02:00 (16 months ago)
Author:
taylor.smock
Message:

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
Location:
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianGmlHandler.java

    r36173 r36176  
    33
    44import org.geotools.referencing.CRS;
    5 import org.opengis.referencing.FactoryException;
    6 import org.opengis.referencing.NoSuchAuthorityCodeException;
    7 import org.opengis.referencing.crs.CoordinateReferenceSystem;
     5import org.geotools.api.referencing.FactoryException;
     6import org.geotools.api.referencing.NoSuchAuthorityCodeException;
     7import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
    88import org.openstreetmap.josm.plugins.opendata.core.io.geographic.DefaultGmlHandler;
    99

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchShpHandler.java

    r36072 r36176  
    55import org.geotools.referencing.operation.projection.LambertConformal2SP;
    66import org.geotools.referencing.operation.projection.MapProjection.AbstractProvider;
    7 import org.opengis.referencing.FactoryException;
    8 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    9 import org.opengis.referencing.crs.ProjectedCRS;
    10 import org.opengis.referencing.datum.GeodeticDatum;
    11 import org.opengis.referencing.operation.MathTransform;
     7import org.geotools.api.referencing.FactoryException;
     8import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     9import org.geotools.api.referencing.crs.ProjectedCRS;
     10import org.geotools.api.referencing.datum.GeodeticDatum;
     11import org.geotools.api.referencing.operation.MathTransform;
    1212import org.openstreetmap.josm.plugins.opendata.core.io.geographic.DefaultShpHandler;
    1313import org.openstreetmap.josm.plugins.opendata.core.io.geographic.GeotoolsHandler;

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGeographicHandler.java

    r36173 r36176  
    33
    44import org.geotools.referencing.CRS;
    5 import org.opengis.referencing.FactoryException;
    6 import org.opengis.referencing.NoSuchAuthorityCodeException;
    7 import org.opengis.referencing.crs.CoordinateReferenceSystem;
     5import org.geotools.api.referencing.FactoryException;
     6import org.geotools.api.referencing.NoSuchAuthorityCodeException;
     7import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
    88
    99public abstract class DefaultGeographicHandler implements GeographicHandler {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGmlHandler.java

    r36072 r36176  
    33
    44import org.geotools.referencing.CRS;
    5 import org.opengis.referencing.FactoryException;
    6 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    7 import org.opengis.referencing.operation.MathTransform;
     5import org.geotools.api.referencing.FactoryException;
     6import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     7import org.geotools.api.referencing.operation.MathTransform;
    88
    99public class DefaultGmlHandler extends DefaultGeographicHandler implements GmlHandler {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultMifHandler.java

    r36072 r36176  
    22package org.openstreetmap.josm.plugins.opendata.core.io.geographic;
    33
    4 import org.opengis.referencing.FactoryException;
    5 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    6 import org.opengis.referencing.operation.MathTransform;
     4import org.geotools.api.referencing.FactoryException;
     5import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     6import org.geotools.api.referencing.operation.MathTransform;
    77import org.openstreetmap.josm.data.projection.Projection;
    88

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicHandler.java

    r36072 r36176  
    22package org.openstreetmap.josm.plugins.opendata.core.io.geographic;
    33
    4 import org.opengis.referencing.FactoryException;
    5 import org.opengis.referencing.NoSuchAuthorityCodeException;
    6 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    7 import org.opengis.referencing.operation.MathTransform;
     4import org.geotools.api.referencing.FactoryException;
     5import org.geotools.api.referencing.NoSuchAuthorityCodeException;
     6import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     7import org.geotools.api.referencing.operation.MathTransform;
    88
    99public interface GeographicHandler {

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java

    r36173 r36176  
    3131import org.locationtech.jts.geom.LineString;
    3232import org.locationtech.jts.geom.Point;
    33 import org.opengis.geometry.MismatchedDimensionException;
    34 import org.opengis.referencing.FactoryException;
    35 import org.opengis.referencing.IdentifiedObject;
    36 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    37 import org.opengis.referencing.crs.ProjectedCRS;
    38 import org.opengis.referencing.cs.CoordinateSystem;
    39 import org.opengis.referencing.datum.Datum;
    40 import org.opengis.referencing.operation.MathTransform;
    41 import org.opengis.referencing.operation.OperationNotFoundException;
    42 import org.opengis.referencing.operation.TransformException;
     33import org.geotools.api.geometry.MismatchedDimensionException;
     34import org.geotools.api.referencing.FactoryException;
     35import org.geotools.api.referencing.IdentifiedObject;
     36import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     37import org.geotools.api.referencing.crs.ProjectedCRS;
     38import org.geotools.api.referencing.cs.CoordinateSystem;
     39import org.geotools.api.referencing.datum.Datum;
     40import org.geotools.api.referencing.operation.MathTransform;
     41import org.geotools.api.referencing.operation.OperationNotFoundException;
     42import org.geotools.api.referencing.operation.TransformException;
    4343import org.openstreetmap.josm.data.coor.ILatLon;
    4444import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    348348     * @param parent The parent component, used for showing dialogs
    349349     * @param findSimiliarCrs {@code true} if we don't need to find the exact CRS
    350      * @throws FactoryException See {@link CRS#findMathTransform}, {@link org.opengis.referencing.AuthorityFactory#getAuthorityCodes}
     350     * @throws FactoryException See {@link CRS#findMathTransform}, {@link org.geotools.api.referencing.AuthorityFactory#getAuthorityCodes}
    351351     * @throws UserCancelException If the user cancelled in one of the message dialogs
    352352     * @throws GeoMathTransformException If no transform could be found

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeotoolsConverter.java

    r36173 r36176  
    1818import javax.swing.JOptionPane;
    1919
    20 import org.geotools.data.DataStore;
    21 import org.geotools.data.FeatureSource;
     20import org.geotools.api.data.DataStore;
     21import org.geotools.api.data.FeatureSource;
    2222import org.geotools.feature.FeatureCollection;
    2323import org.geotools.feature.FeatureIterator;
    … …  
    2828import org.locationtech.jts.geom.Polygon;
    2929import org.locationtech.jts.io.ParseException;
    30 import org.opengis.feature.Feature;
    31 import org.opengis.feature.GeometryAttribute;
    32 import org.opengis.feature.Property;
    33 import org.opengis.feature.type.GeometryDescriptor;
    34 import org.opengis.feature.type.Name;
    35 import org.opengis.geometry.MismatchedDimensionException;
    36 import org.opengis.referencing.FactoryException;
    37 import org.opengis.referencing.operation.TransformException;
     30import org.geotools.api.feature.Feature;
     31import org.geotools.api.feature.GeometryAttribute;
     32import org.geotools.api.feature.Property;
     33import org.geotools.api.feature.type.GeometryDescriptor;
     34import org.geotools.api.feature.type.Name;
     35import org.geotools.api.geometry.MismatchedDimensionException;
     36import org.geotools.api.referencing.FactoryException;
     37import org.geotools.api.referencing.operation.TransformException;
    3838import org.openstreetmap.josm.data.osm.DataSet;
    3939import org.openstreetmap.josm.data.osm.OsmPrimitive;

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeotoolsHandler.java

    r36173 r36176  
    1414import org.geotools.referencing.operation.projection.LambertConformal2SP;
    1515import org.geotools.referencing.operation.projection.MapProjection.AbstractProvider;
    16 import org.opengis.parameter.ParameterDescriptor;
    17 import org.opengis.parameter.ParameterValueGroup;
    18 import org.opengis.referencing.FactoryException;
    19 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    20 import org.opengis.referencing.datum.GeodeticDatum;
    21 import org.opengis.referencing.operation.MathTransform;
     16import org.geotools.api.parameter.ParameterDescriptor;
     17import org.geotools.api.parameter.ParameterValueGroup;
     18import org.geotools.api.referencing.FactoryException;
     19import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     20import org.geotools.api.referencing.datum.GeodeticDatum;
     21import org.geotools.api.referencing.operation.MathTransform;
    2222import org.openstreetmap.josm.data.projection.AbstractProjection;
    2323import org.openstreetmap.josm.data.projection.Ellipsoid;
    … …  
    4040     * A mapping of GeoTools ellipsoid to JOSM ellipsoids. Don't use outside the {@link GeotoolsHandler} class.
    4141     */
    42     List<Pair<org.opengis.referencing.datum.Ellipsoid, Ellipsoid>>
     42    List<Pair<org.geotools.api.referencing.datum.Ellipsoid, Ellipsoid>>
    4343            ellipsoids = Collections.unmodifiableList(Arrays.asList(
    4444            new Pair<>(DefaultEllipsoid.GRS80, Ellipsoid.GRS80),
    … …  
    6363                        AbstractProjection ap = (AbstractProjection) p;
    6464                        if (ap.getProj() instanceof LambertConformalConic) {
    65                             for (Pair<org.opengis.referencing.datum.Ellipsoid, Ellipsoid> pair : ellipsoids) {
     65                            for (Pair<org.geotools.api.referencing.datum.Ellipsoid, Ellipsoid> pair : ellipsoids) {
    6666                                if (pair.a.equals(geo.getEllipsoid()) && pair.b.equals(ap.getEllipsoid())) {
    6767                                    boolean ok = true;

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReader.java

    r36173 r36176  
    1616import org.locationtech.jts.geom.GeometryFactory;
    1717import org.locationtech.jts.geom.Point;
    18 import org.opengis.geometry.MismatchedDimensionException;
    19 import org.opengis.referencing.FactoryException;
    20 import org.opengis.referencing.crs.CoordinateReferenceSystem;
    21 import org.opengis.referencing.operation.MathTransform;
    22 import org.opengis.referencing.operation.TransformException;
     18import org.geotools.api.geometry.MismatchedDimensionException;
     19import org.geotools.api.referencing.FactoryException;
     20import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
     21import org.geotools.api.referencing.operation.MathTransform;
     22import org.geotools.api.referencing.operation.TransformException;
    2323import org.openstreetmap.josm.data.osm.DataSet;
    2424import org.openstreetmap.josm.data.osm.Node;

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java

    r36173 r36176  
    2121import java.util.Set;
    2222
    23 import org.geotools.data.DataStore;
     23import org.geotools.api.data.DataStore;
    2424import org.geotools.data.shapefile.ShapefileDataStoreFactory;
    2525import org.locationtech.jts.geom.Point;
    26 import org.opengis.geometry.MismatchedDimensionException;
    27 import org.opengis.referencing.FactoryException;
    28 import org.opengis.referencing.operation.TransformException;
     26import org.geotools.api.geometry.MismatchedDimensionException;
     27import org.geotools.api.referencing.FactoryException;
     28import org.geotools.api.referencing.operation.TransformException;
    2929import org.openstreetmap.josm.data.osm.DataSet;
    3030import org.openstreetmap.josm.data.osm.Node;

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/geopackage/GeoPackageReader.java

    r36071 r36176  
    1010import java.util.Map;
    1111
    12 import org.geotools.data.DataStore;
    13 import org.geotools.data.DataStoreFinder;
     12import org.geotools.api.data.DataStore;
     13import org.geotools.api.data.DataStoreFinder;
    1414import org.geotools.geopkg.GeoPkgDataStoreFactory;
    15 import org.opengis.referencing.FactoryException;
    16 import org.opengis.referencing.operation.TransformException;
     15import org.geotools.api.referencing.FactoryException;
     16import org.geotools.api.referencing.operation.TransformException;
    1717import org.openstreetmap.josm.data.osm.DataSet;
    1818import org.openstreetmap.josm.gui.progress.ProgressMonitor;
Note: See TracChangeset for help on using the changeset viewer.