Changeset 36176 in osm for applications/editors/josm/plugins/apache-http

Timestamp:

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

Files:

• build.xml (modified) (1 diff)
• ivy.xml (modified) (1 diff)

applications/editors/josm/plugins/apache-http/build.xml

@@ -18 +18 @@
     <import file="../build-common.xml"/>
 
-    <target name="resolve" description="--> retrieve dependencies with Ivy">
-        <ivy:retrieve/>
+    <target name="pre-compile" depends="fetch_dependencies">
+        <!-- include fetch_dependencies task -->
     </target>
-
-    <target name="dist" depends="resolve,plugin_common.dist"/>
-
 </project>

applications/editors/josm/plugins/apache-http/ivy.xml

@@ -4 +4 @@
     <info organisation="org.openstreetmap.josm.plugins" module="apache-http"/>
     <dependencies>
-        <!-- Leave these in until at least 2021-03-01 so plugins can migrate -->
-        <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.4.15" conf="default->default"/>
-        <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.13" conf="default->default"/>
-        <dependency org="org.apache.httpcomponents" name="httpmime" rev="4.5.13" conf="default->default"/>
-        <!-- These are in a different namespace, so conflicts shouldn't occur. -->
-        <dependency org="org.apache.httpcomponents.client5" name="httpclient5" rev="5.1.2" conf="default->default"/>
+        <dependency org="org.apache.httpcomponents.client5" name="httpclient5" rev="5.2.1" conf="default->default"/>
         <!-- We may want to add fluent, cache, and windows extensions in the future -->
     </dependencies>