Changeset 36028 in osm for applications/editors

Timestamp:

2022-10-19T21:45:06+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22455: NPE when opening GeoPackage

This updates the merge-services.jar file using a fork
( ​https://github.com/JOSM/merge-jar-services ), which
allows us to merge the service files every time we do
a build. The fork also fixes the annoying issue where
service files not ending in a newline will have a
newline appended.

Location:

applications/editors/josm/plugins/geotools

Files:

• build.xml (modified) (4 diffs)
• jar (deleted)
• tools/merge-services.jar (modified) ( previous)

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

@@ -48 +48 @@
     <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"/>
+        <delete dir="jar/"/>
+        <mkdir dir="jar"/>
         <merge-services dest="jar">
             <fileset dir="lib">
@@ -56 +57 @@
             </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>
+        <!-- We currently don't like shipping maven pom files or other "useless" files (see #21667) -->
+        <delete includeEmptyDirs="true">
+            <fileset dir="jar">
+                <include name="META-INF/maven/**/*"/>
+                <include name="META-INF/maven"/>
+                <include name="META-INF/ECLIPSE*"/>
+                <include name="META-INF/eclipse*"/>
+                <include name="META-INF/INDEX.LIST"/>
+                <include name="META-INF/MANIFEST.MF"/>
+                <include name="META-INF/**/module-info.class"/>
+            </fileset>
+        </delete>
 
         <merge-text-files mergefile="META-INF/javax.media.jai.registryFile.jai" targetdir="jar"/>
@@ -71 +80 @@
     **********************************************************
     -->
-    <target name="post-dist">
+    <target name="post-dist" depends="merge-geotools-services">
         <move file="${plugin.jar}" todir="${plugin.build.dir}" />
         <jar destfile="${plugin.jar}" filesetmanifest="merge" manifestencoding="UTF-8">
@@ -87 +96 @@
         </jar>
         <delete file="${plugin.build.dir}/${ant.project.name}.jar" />
+        <delete dir="jar" />
     </target>