Index: applications/editors/josm/plugins/geotools/README
===================================================================
--- applications/editors/josm/plugins/geotools/README	(revision 35901)
+++ applications/editors/josm/plugins/geotools/README	(revision 35903)
@@ -4,3 +4,4 @@
     * Licensed under GPL v3 (see LICENSE)
 
-The current embedded version of GeoTools is 19.2.
+The current embedded version of GeoTools is 26.2.
+
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>
Index: applications/editors/josm/plugins/geotools/ivy_settings.xml
===================================================================
--- applications/editors/josm/plugins/geotools/ivy_settings.xml	(revision 35901)
+++ applications/editors/josm/plugins/geotools/ivy_settings.xml	(revision 35903)
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ivysettings>
-  <!--<include file="../../core/ivysettings.xml"/>-->
-  <property name="gt.version" value="26.1"/> <!-- 26.1 -->
+  <!-- When geotools is updated, run `ant merge-geotools-services` -->
+  <property name="gt.version" value="26.2"/>
   <settings defaultResolver="ordered-resolvers"/>
   <resolvers>
     <chain name="ordered-resolvers">
+      <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
       <ibiblio name="osgeo" m2compatible="true" root="https://repo.osgeo.org/repository/release/" />
       <ibiblio name="central" m2compatible="true" root="https://repo1.maven.org/maven2/" />
-      <!--<ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />-->
-      <!--<resolver ref="josm-nexus"/>-->
     </chain>
   </resolvers>
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/com.fasterxml.jackson.core.JsonFactory
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/com.fasterxml.jackson.core.JsonFactory	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/com.fasterxml.jackson.core.JsonFactory	(revision 35903)
@@ -0,0 +1,1 @@
+com.fasterxml.jackson.core.JsonFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver	(revision 35903)
@@ -1,1 +1,1 @@
-org.hsqldb.jdbc.JDBCDriver
+org.h2.Driverorg.hsqldb.jdbc.JDBCDriver
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageInputStreamSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageInputStreamSpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageInputStreamSpi	(revision 35903)
@@ -1,7 +1,5 @@
 it.geosolutions.imageio.stream.input.spi.FileImageInputStreamExtImplSpi
 it.geosolutions.imageio.stream.input.spi.URLImageInputStreamSpi
-it.geosolutions.imageio.stream.input.spi.StringImageInputStreamSpi
-
-#
+it.geosolutions.imageio.stream.input.spi.StringImageInputStreamSpi#
 # $RCSfile: javax.imageio.spi.ImageInputStreamSpi,v $
 #
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi	(revision 35903)
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageReaderSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageReaderSpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageReaderSpi	(revision 35903)
@@ -1,5 +1,3 @@
-it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi
-
-#
+it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi#
 # $RCSfile: javax.imageio.spi.ImageReaderSpi,v $
 #
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageWriterSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageWriterSpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageWriterSpi	(revision 35903)
@@ -1,4 +1,3 @@
 it.geosolutions.imageioimpl.plugins.tiff.TIFFImageWriterSpi
-
 #
 # $RCSfile: javax.imageio.spi.ImageWriterSpi,v $
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.FormatService
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.FormatService	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.FormatService	(revision 35903)
@@ -0,0 +1,1 @@
+tech.units.indriya.format.DefaultFormatService
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.ServiceProvider
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.ServiceProvider	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.ServiceProvider	(revision 35903)
@@ -0,0 +1,2 @@
+tech.units.indriya.spi.DefaultServiceProvidersi.uom.SIServiceProvider
+systems.uom.common.spi.CommonServiceProvider
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.SystemOfUnitsService
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.SystemOfUnitsService	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.SystemOfUnitsService	(revision 35903)
@@ -0,0 +1,1 @@
+tech.units.indriya.unit.DefaultSystemOfUnitsService
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.UnitFormatService
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.UnitFormatService	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.UnitFormatService	(revision 35903)
@@ -0,0 +1,1 @@
+tech.units.indriya.format.DefaultUnitFormatService
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationRegistrySpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationRegistrySpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationRegistrySpi	(revision 35903)
@@ -46,2 +46,3 @@
 #
 com.sun.media.jai.imageioimpl.ImageReadWriteSpi
+it.geosolutions.jaiext.crop.CropSpi
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi	(revision 35903)
@@ -1,5 +1,1 @@
-org.jaitools.media.jai.contour.ContourSpi
-org.jaitools.media.jai.rangelookup.RangeLookupSpi
-org.jaitools.media.jai.vectorbinarize.VectorBinarizeSpi
-org.jaitools.media.jai.vectorize.VectorizeSpi
 org.jaitools.media.jai.zonalstats.ZonalStatsSpi
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi	(revision 35903)
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi	(revision 35903)
@@ -1,2 +1,4 @@
+org.geotools.data.h2.H2DataStoreFactory
+org.geotools.data.h2.H2JNDIDataStoreFactory
 org.geotools.data.shapefile.ShapefileDataStoreFactory
 org.geotools.data.shapefile.ShapefileDirectoryFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.jdbc.datasource.DataSourceFactorySpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.jdbc.datasource.DataSourceFactorySpi	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.jdbc.datasource.DataSourceFactorySpi	(revision 35903)
@@ -0,0 +1,2 @@
+org.geotools.data.jdbc.datasource.JNDIDataSourceFactory
+org.geotools.data.jdbc.datasource.DBCPDataSourceFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.jdbc.datasource.UnWrapper
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.jdbc.datasource.UnWrapper	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.jdbc.datasource.UnWrapper	(revision 35903)
@@ -0,0 +1,2 @@
+org.geotools.data.jdbc.datasource.DBCPUnWrapper
+org.geotools.jdbc.LifecycleConnectionUnWrapper
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.http.HTTPClientFactory
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.http.HTTPClientFactory	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.http.HTTPClientFactory	(revision 35903)
@@ -0,0 +1,1 @@
+org.geotools.http.DefaultHTTPClientFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 35903)
@@ -42,4 +42,5 @@
 org.geotools.referencing.operation.projection.NewZealandMapGrid$Provider
 org.geotools.referencing.operation.projection.Krovak$Provider
+org.geotools.referencing.operation.projection.Krovak$NorthProvider
 org.geotools.referencing.operation.projection.CassiniSoldner$Provider
 org.geotools.referencing.operation.projection.EquidistantConic$Provider
@@ -55,4 +56,5 @@
 org.geotools.referencing.operation.projection.WorldVanDerGrintenI$Provider
 org.geotools.referencing.operation.projection.Sinusoidal$Provider
+org.geotools.referencing.operation.projection.Homolosine$Provider
 org.geotools.referencing.operation.projection.GeneralOblique$Provider
 org.geotools.referencing.operation.projection.MeteosatSG$Provider
@@ -64,2 +66,3 @@
 org.geotools.referencing.operation.projection.CylindricalEqualArea$LambertCylindricalEqualAreaProvider
 org.geotools.referencing.operation.projection.EqualArea$Provider
+
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.renderer.crs.ProjectionHandlerFactory
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.renderer.crs.ProjectionHandlerFactory	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.renderer.crs.ProjectionHandlerFactory	(revision 35903)
@@ -5,9 +5,6 @@
 org.geotools.renderer.crs.LambertAzimuthalEqualAreaHandlerFactory
 org.geotools.renderer.crs.ConicHandlerFactory
-org.geotools.renderer.crs.WorldVanDerGrintenIHandlerFactoryorg.geotools.renderer.crs.GeographicHandlerFactory
-org.geotools.renderer.crs.MercatorHandlerFactory
-org.geotools.renderer.crs.TransverseMercatorHandlerFactory
-org.geotools.renderer.crs.PolarStereographicHandlerFactory
-org.geotools.renderer.crs.LambertAzimuthalEqualAreaHandlerFactory
-org.geotools.renderer.crs.ConicHandlerFactory
 org.geotools.renderer.crs.WorldVanDerGrintenIHandlerFactory
+org.geotools.renderer.crs.AzimulthalEquidistantProjectionHandlerFactory
+org.geotools.renderer.crs.HomolosineHandlerFactory
+org.geotools.renderer.crs.OrthographicProjectionHandlerFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 35903)
@@ -1,2 +1,3 @@
+org.geotools.data.h2.H2ClobConverterFactory
 org.geotools.data.util.CommonsConverterFactory
 org.geotools.data.util.NumericConverterFactory
@@ -20,2 +21,3 @@
 org.geotools.data.util.InterpolationConverterFactory
 org.geotools.data.util.LobConverterFactory
+org.geotools.data.util.AbbreviatedTimeUnitConverterFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 35901)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 35903)
@@ -2,4 +2,5 @@
 org.geotools.filter.AreaFunction
 org.geotools.filter.LengthFunction
+org.geotools.filter.function.ArrayFunction
 org.geotools.filter.function.AttributeCountFunction
 org.geotools.filter.function.CategorizeFunction
@@ -21,4 +22,5 @@
 org.geotools.filter.function.EnvFunction
 org.geotools.filter.function.StringTemplateFunction
+org.geotools.filter.function.InArrayFunction
 org.geotools.filter.function.FilterFunction_contains
 org.geotools.filter.function.FilterFunction_isEmpty
@@ -141,4 +143,5 @@
 org.geotools.filter.function.IDFunction
 org.geotools.filter.function.InterpolateFunction
+org.geotools.filter.function.MapGetFunction
 org.geotools.filter.function.RecodeFunction
 org.geotools.filter.function.math.FilterFunction_IEEEremainder
@@ -199,4 +202,7 @@
 org.geotools.filter.function.BoundedByFunction
 org.geotools.filter.function.DateDifferenceFunction
-# Disabled for JOSM as it requires com.fasterxml.jackson.core.JsonFactory
-#org.geotools.filter.function.JsonPointerFunction
+org.geotools.filter.function.JsonPointerFunction
+org.geotools.filter.function.AndFunction
+org.geotools.filter.function.OrFunction
+org.geotools.filter.function.NowFunction
+org.geotools.filter.function.BandsFunction
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/tech.units.indriya.spi.NumberSystem
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/tech.units.indriya.spi.NumberSystem	(revision 35903)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/tech.units.indriya.spi.NumberSystem	(revision 35903)
@@ -0,0 +1,1 @@
+tech.units.indriya.function.DefaultNumberSystem