Changeset 35958 in osm

Timestamp:

2022-04-18T23:24:43+02:00 (3 years ago)

Author:

taylor.smock

Message:

geotools: Fix #21995 by removing Jackson and putting Jackson in its own plugin

Location:

applications/editors/josm/plugins

Files:

• geotools/build.xml (modified) (3 diffs)
• geotools/ivy.xml (modified) (1 diff)
• jackson (added)
• jackson/LICENSE (added)
• jackson/README.md (added)
• jackson/build.xml (added)
• jackson/ivy.xml (added)
• jackson/src (added)
• jackson/src/org (added)
• jackson/src/org/openstreetmap (added)
• jackson/src/org/openstreetmap/josm (added)
• jackson/src/org/openstreetmap/josm/plugins (added)
• jackson/src/org/openstreetmap/josm/plugins/jackson (added)
• jackson/src/org/openstreetmap/josm/plugins/jackson/JacksonPlugin.java (added)

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

@@ -11 +11 @@
     <property name="plugin.icon" value="images/compass.png"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.requires" value="ejml;apache-commons;jaxb;jts"/>
+    <property name="plugin.requires" value="apache-commons;ejml;jackson;jaxb;jts"/>
     <property name="plugin.stage" value="20"/>
 
@@ -21 +21 @@
     </target>
 
-        <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+    <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="jackson.jar"/>
     </fileset>
 
     <target name="merge-geotools-services" depends="fetch_dependencies">
         <taskdef resource="org/pescuma/mergeservices/antlib.xml" classpath="tools/merge-services.jar" />
-        <delete dir="jar/META-INF/services"/>
-        <merge-services dest="jar">
-            <fileset dir="lib">
-                <include name="**/*.jar" />
-                <exclude name="**/*-javadoc.jar" />
-                <exclude name="**/*-source.jar" />
-            </fileset>
-        </merge-services>
-        <echo>Check the updated files in jar/META-INF/services for lines where two
-        services got merged. Example:
-        org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
-        </echo>
+        <delete dir="jar/META-INF/services"/>
+        <merge-services dest="jar">
+            <fileset dir="lib">
+                <include name="**/*.jar" />
+                <exclude name="**/*-javadoc.jar" />
+                <exclude name="**/*-source.jar" />
+            </fileset>
+        </merge-services>
+    <echo>Check the updated files in jar/META-INF/services for lines where two
+    services got merged. Example:
+    org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
+    </echo>
     </target>
 
@@ -74 +75 @@
     <target name="additional-manifest">
         <manifest file="MANIFEST" mode="update">
-                <!-- JAI requires a vendor name for some of its deep internals, 
-                     see https://stackoverflow.com/a/18495658/2257172 -->
+            <!-- JAI requires a vendor name for some of its deep internals, 
+                 see https://stackoverflow.com/a/18495658/2257172 -->
             <attribute name="Specification-Title" value="JOSM GeoTools plugin"/>
-            <attribute name="Specification-Version" value="${gt.version}"/>
+            <attribute name="Specification-Version" value="${gt.version}"/>
             <attribute name="Specification-Vendor" value="JOSM developers" />
             <attribute name="Implementation-Title" value="org.openstreetmap.josm.plugins.geotools" />
-            <attribute name="Implementation-Version" value="${gt.version}" />
+            <attribute name="Implementation-Version" value="${gt.version}" />
             <attribute name="Implementation-Vendor" value="JOSM developers"/>
         </manifest>

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

@@ -43 +43 @@
         <exclude org="org.brotli" module="dec"/>
         <exclude org="org.tukaani" module="xz"/>
-        <!-- from jaxb plugin -->
-        <exclude org="javax.activation" module="javax.activation-api"/>
+        <!-- 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>