Changeset 36176 in osm for applications/editors/josm/plugins/geotools

Timestamp:

2023-10-19T21:58:56+02:00 (13 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/geotools

Files:

• build.xml (modified) (1 diff)
• ivy.xml (modified) (1 diff)
• ivy_settings.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/geotools/build.xml

@@ -13 +13 @@
     <property name="plugin.requires" value="apache-commons;ejml;jackson;jaxb;jts"/>
     <property name="plugin.stage" value="20"/>
+    <property name="plugin.minimum.java.version" value="11"/>
 
     <!-- ** include targets that all plugins have in common ** -->

applications/editors/josm/plugins/geotools/ivy.xml

@@ -11 +11 @@
         <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-api" 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"/>

applications/editors/josm/plugins/geotools/ivy_settings.xml

@@ -2 +2 @@
 <ivysettings>
   <!-- When geotools is updated, run `ant merge-geotools-services` -->
-  <property name="gt.version" value="28.2"/>
+  <property name="gt.version" value="30.0"/>
+  <include file="${josm.ivysettings}" optional="true" /> <!-- optional for IDEs -->
   <settings defaultResolver="ordered-resolvers"/>
   <resolvers>

applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.ServiceLoader;
@@ -15 +16 @@
 import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.NoSuchAuthorityCodeException;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.NoSuchAuthorityCodeException;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -102 +103 @@
 
     private static void checkEPSG() {
+        final Collection<String> codes = CRS.getSupportedCodes("EPSG");
+        if (codes.isEmpty() || !(codes.contains("4326") || codes.contains("EPSG:4326"))) {
         try {
-            CRS.decode("EPSG:4326");
-        } catch (NoSuchAuthorityCodeException e) {
-            Logging.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: "+e.getMessage());
-        } catch (FactoryException e) {
-            Logging.error("geotools: error in EPSG database initialization. FactoryException: "+e.getMessage());
+                CRS.decode("EPSG:4326");
+            } catch (NoSuchAuthorityCodeException e) {
+                Logging.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: " + e.getMessage());
+            } catch (FactoryException e) {
+                Logging.error("geotools: error in EPSG database initialization. FactoryException: " + e.getMessage());
+            }
         }
     }