Changeset 35903 in osm for applications/editors/josm/plugins/geotools/build.xml

Timestamp:

2022-01-27T17:48:29+01:00 (4 years ago)

Author:

taylor.smock

Message:

geotools: run ant merge-geotools-services

This should fix the services issues seen in #21803.

This also updates geotools to 26.2.

File:

• applications/editors/josm/plugins/geotools/build.xml (modified) (4 diffs)

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

@@ -28 +28 @@
     </fileset>
 
-    <target name="merge-geotools-services">
+    <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"/>
@@ -38 +38 @@
             </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>
 
@@ -58 +62 @@
                 <include name="META-INF/MANIFEST.MF"/>
                 <include name="META-INF/javax.media.jai.registryFile.jai"/>
-                <!-- Required by the JSR 385 implementation (indriya). See JOSM #21803 -->
-                <include name="META-INF/services/tech.units.indriya.spi.NumberSystem"/>
-                <include name="META-INF/services/org.geotools.*"/>
-                <include name="META-INF/services/org.opengis.*"/>
             </zipfileset>
         </jar>
@@ -77 +77 @@
                      see https://stackoverflow.com/a/18495658/2257172 -->
             <attribute name="Specification-Title" value="JOSM GeoTools plugin"/>
-            <attribute name="Specification-Version" value="22.0"/>
+            <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="22.0" />
+            <attribute name="Implementation-Version" value="${gt.version}" />
             <attribute name="Implementation-Vendor" value="JOSM developers"/>
         </manifest>