Index: applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- applications/editors/josm/plugins/geotools/build.xml	(revision 35901)
+++ applications/editors/josm/plugins/geotools/build.xml	(revision 35903)
@@ -28,5 +28,5 @@
     </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,4 +38,8 @@
     	    </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,8 +62,4 @@
                 <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,8 +77,8 @@
         	     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>