Index: /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 35122)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/.classpath	(revision 35123)
@@ -8,40 +8,35 @@
 	<classpathentry kind="lib" path="lib/commons-collections-3.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/commons-jxpath-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/gt-app-schema-resolver-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-app-schema-resolver-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-cql-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-cql-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-render-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-render-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-referencing3D-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-wfs-ng-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-wfs-ng-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-xml-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-xml-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-xsd-core-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-xsd-core-19.0.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="lib/gt-xsd-wfs-19.0.jar">
+	<classpathentry kind="lib" path="lib/gt-xsd-wfs-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java	(revision 35122)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/GeoFabrikWFSClient.java	(revision 35123)
@@ -12,5 +12,4 @@
 import org.geotools.data.FeatureSource;
 import org.geotools.factory.CommonFactoryFinder;
-import org.geotools.factory.GeoTools;
 import org.geotools.feature.FeatureCollection;
 import org.geotools.geometry.jts.ReferencedEnvelope;
@@ -80,6 +79,5 @@
 		// Ask WFS service for typeName data constrained by bboxRef
 		//
-		FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2(GeoTools
-				.getDefaultHints());
+		FilterFactory2 ff = CommonFactoryFinder.getFilterFactory2();
 		Filter filterBB = ff.bbox(ff.property(geomName), bboxRef);
 		FeatureCollection<SimpleFeatureType, SimpleFeature> features = source
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java	(revision 35122)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/ImportOsmInspectorBugsAction.java	(revision 35123)
@@ -19,5 +19,5 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import com.vividsolutions.jts.io.ParseException;
+import org.locationtech.jts.io.ParseException;
 
 public class ImportOsmInspectorBugsAction extends JosmAction {
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 35122)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 35123)
@@ -60,7 +60,7 @@
 import org.openstreetmap.josm.tools.Logging;
 
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
+import org.locationtech.jts.geom.Envelope;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.io.ParseException;
 
 public class OsmInspectorLayer extends Layer {
Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java	(revision 35122)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/gui/OsmInspectorDialog.java	(revision 35123)
@@ -32,6 +32,6 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Point;
 
 public class OsmInspectorDialog extends ToggleDialog implements LayerChangeListener, ActiveLayerChangeListener {
@@ -233,5 +233,5 @@
 	@Override
 	public void layerAdded(LayerAddEvent e) {
-		if (layer instanceof OsmInspectorLayer) {
+		if (layer != null) {
 			refreshModel();
 			refreshBugList();
@@ -241,5 +241,5 @@
 	@Override
 	public void layerRemoving(LayerRemoveEvent e) {
-		if (layer instanceof OsmInspectorLayer) {
+		if (layer != null) {
 			bugsList.clearSelection();
 			model.clear();
Index: /applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- /applications/editors/josm/plugins/geotools/.classpath	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/.classpath	(revision 35123)
@@ -6,56 +6,51 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2-noclassprop.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/GeographicLib-Java-1.44.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gt-api-19.2.jar" sourcepath="lib/gt-api-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/GeographicLib-Java-1.49.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-api-22.0.jar" sourcepath="lib/gt-coverage-api-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-19.2.jar" sourcepath="lib/gt-coverage-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-22.0.jar" sourcepath="lib/gt-coverage-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-data-19.2.jar" sourcepath="lib/gt-data-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-22.0.jar" sourcepath="lib/gt-epsg-extension-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-19.2.jar" sourcepath="lib/gt-epsg-extension-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-22.0.jar" sourcepath="lib/gt-epsg-hsql-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-19.2.jar" sourcepath="lib/gt-epsg-hsql-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-22.0.jar" sourcepath="lib/gt-geotiff-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-19.2.jar" sourcepath="lib/gt-geotiff-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-main-22.0.jar" sourcepath="lib/gt-main-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-main-19.2.jar" sourcepath="lib/gt-main-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-22.0.jar" sourcepath="lib/gt-metadata-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-19.2.jar" sourcepath="lib/gt-metadata-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-22.0.jar" sourcepath="lib/gt-opengis-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-19.2.jar" sourcepath="lib/gt-opengis-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-22.0.jar" sourcepath="lib/gt-referencing-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-19.2.jar" sourcepath="lib/gt-referencing-19.2-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-19.2.jar" sourcepath="lib/gt-shapefile-19.2-sources.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-22.0.jar" sourcepath="lib/gt-shapefile-22.0-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
@@ -63,25 +58,24 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.24.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.3.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.3.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.3.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.3.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_imageio-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbin-1.0.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.24.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbin-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.1.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.5.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
 	<classpathentry kind="output" path="bin"/>
Index: plications/editors/josm/plugins/geotools/jar/META-INF/services/com.vividsolutions.xdo.SchemaBuilder
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/com.vividsolutions.xdo.SchemaBuilder	(revision 35122)
+++ 	(revision )
@@ -1,1 +1,0 @@
-org.geotools.xml.SchemaFactory
Index: plications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataSourceFactorySpi
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataSourceFactorySpi	(revision 35122)
+++ 	(revision )
@@ -1,1 +1,0 @@
-org.geotools.data.gml.GMLDataSourceFactory
Index: plications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.FeatureLockFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.FeatureLockFactory	(revision 35122)
+++ 	(revision )
@@ -1,1 +1,0 @@
-org.geotools.data.DefaultFeatureLockFactory
Index: plications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.feature.FeatureCollections
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.feature.FeatureCollections	(revision 35122)
+++ 	(revision )
@@ -1,1 +1,0 @@
-org.geotools.feature.DefaultFeatureCollections
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.filter.FunctionExpression
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.filter.FunctionExpression	(revision 35123)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.filter.FunctionExpression	(revision 35123)
@@ -0,0 +1,1 @@
+org.geotools.filter.function.PropertyExistsFunction
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 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 35123)
@@ -14,4 +14,5 @@
 org.geotools.referencing.operation.transform.SimilarityTransformProvider
 org.geotools.referencing.operation.transform.WarpTransform2DProvider
+org.geotools.referencing.operation.transform.EarthGravitationalModel$Provider
 org.geotools.referencing.operation.projection.EquidistantCylindrical$Provider
 org.geotools.referencing.operation.projection.EquidistantCylindrical$SphericalProvider
@@ -62,2 +63,3 @@
 org.geotools.referencing.operation.projection.CylindricalEqualArea$BehrmannProvider
 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.util.ConverterFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 35123)
@@ -1,16 +1,21 @@
-org.geotools.util.CommonsConverterFactory
-org.geotools.util.NumericConverterFactory
-org.geotools.util.PercentageConverterFactory
-org.geotools.util.GeometryConverterFactory
-org.geotools.util.GeometryTypeConverterFactory
-org.geotools.util.TemporalConverterFactory
-org.geotools.util.BooleanConverterFactory
-org.geotools.util.ColorConverterFactory
-org.geotools.util.CollectionConverterFactory
-org.geotools.util.CharsetConverterFactory
-org.geotools.util.UuidConverterFactory
-org.geotools.util.EnumerationConverterFactory
-org.geotools.util.QNameConverterFactory
-org.geotools.util.MeasureConverterFactory
+org.geotools.data.util.CommonsConverterFactory
+org.geotools.data.util.NumericConverterFactory
+org.geotools.data.util.PercentageConverterFactory
+org.geotools.data.util.GeometryConverterFactory
+org.geotools.data.util.GeometryTypeConverterFactory
+org.geotools.data.util.TemporalConverterFactory
+org.geotools.data.util.BooleanConverterFactory
+org.geotools.data.util.ColorConverterFactory
+org.geotools.data.util.CollectionConverterFactory
+org.geotools.data.util.CharsetConverterFactory
+org.geotools.data.util.UuidConverterFactory
+org.geotools.data.util.EnumerationConverterFactory
+org.geotools.data.util.QNameConverterFactory
+org.geotools.data.util.MeasureConverterFactory
 org.geotools.temporal.TemporalConverterFactory
-org.geotools.util.NameConverterFactory
+org.geotools.data.util.NameConverterFactory
+org.geotools.data.util.ArrayConverterFactory
+org.geotools.data.util.ComplexAttributeConverterFactory
+org.geotools.data.util.CRSConverterFactory
+org.geotools.data.util.InterpolationConverterFactory
+org.geotools.data.util.LobConverterFactory
Index: plications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.xml.schema.Schema
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.xml.schema.Schema	(revision 35122)
+++ 	(revision )
@@ -1,3 +1,0 @@
-org.geotools.xml.xLink.XLinkSchema
-org.geotools.xml.gml.GMLSchema
-org.geotools.xml.filter.FilterSchema
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.coverage.processing.Operation
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.coverage.processing.Operation	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.coverage.processing.Operation	(revision 35123)
@@ -21,4 +21,5 @@
 org.geotools.coverage.processing.operation.Scale
 org.geotools.coverage.processing.operation.SelectSampleDimension
+org.geotools.coverage.processing.operation.ShadedRelief
 org.geotools.coverage.processing.operation.SubsampleAverage
 org.geotools.coverage.processing.operation.SubtractConst
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 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 35123)
@@ -1,3 +1,3 @@
-org.geotools.resources.coverage.FilterFunction_isCoverage
+org.geotools.coverage.util.FilterFunction_isCoverage
 org.geotools.filter.AreaFunction
 org.geotools.filter.LengthFunction
@@ -8,4 +8,5 @@
 org.geotools.filter.function.StandardDeviationFunction
 org.geotools.filter.function.QuantileFunction
+org.geotools.filter.function.EqualAreaFunction
 org.geotools.filter.function.UniqueIntervalFunction
 org.geotools.filter.function.Collection_AverageFunction
@@ -82,4 +83,7 @@
 org.geotools.filter.function.FilterFunction_strStartsWith
 org.geotools.filter.function.FilterFunction_strCapitalize
+org.geotools.filter.function.FilterFunction_strAbbreviate
+org.geotools.filter.function.FilterFunction_strDefaultIfBlank
+org.geotools.filter.function.FilterFunction_strStripAccents
 org.geotools.filter.function.FilterFunction_strEqualsIgnoreCase
 org.geotools.filter.function.FilterFunction_strIndexOf
@@ -172,7 +176,26 @@
 org.geotools.filter.function.math.ModuloFunction
 org.geotools.filter.function.math.PiFunction
+org.geotools.filter.function.PropertyExistsFunction
 org.geotools.filter.function.string.ConcatenateFunction
 org.geotools.filter.function.string.URLEncodeFunction
 org.geotools.filter.function.JenksNaturalBreaksFunction
+org.geotools.filter.function.FilterFunction_listMultiply
 org.geotools.filter.function.FilterFunction_list
+org.geotools.filter.function.LapplyFunction
+org.geotools.filter.function.LitemFunction
+org.geotools.filter.function.SizeFunction
 org.geotools.styling.visitor.RescaleToPixelsFunction
+org.geotools.filter.function.color.HSLFunction
+org.geotools.filter.function.color.SaturateFunction
+org.geotools.filter.function.color.DesaturateFunction
+org.geotools.filter.function.color.DarkenFunction
+org.geotools.filter.function.color.LightenFunction
+org.geotools.filter.function.color.SpinFunction
+org.geotools.filter.function.color.MixFunction
+org.geotools.filter.function.color.TintFunction
+org.geotools.filter.function.color.ShadeFunction
+org.geotools.filter.function.color.GrayscaleFunction
+org.geotools.filter.function.color.ConstrastFunction
+org.geotools.filter.function.BoundedByFunction
+org.geotools.filter.function.DateDifferenceFunction
+org.geotools.filter.function.JsonPointerFunction
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.crs.CRSAuthorityFactory	(revision 35123)
@@ -1,8 +1,7 @@
-org.geotools.referencing.factory.epsg.UnnamedExtension
-org.geotools.referencing.factory.epsg.EsriExtension
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+org.geotools.referencing.epsg.esri.UnnamedExtension
+org.geotools.referencing.epsg.esri.EsriExtension
+org.geotools.referencing.factory.epsg.hsql.ThreadedHsqlEpsgFactory
 # pending review
 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
-org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.FactoryUsingWKT
 org.geotools.referencing.factory.epsg.LongitudeFirstFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.cs.CSAuthorityFactory	(revision 35123)
@@ -1,6 +1,5 @@
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+org.geotools.referencing.factory.epsg.hsql.ThreadedHsqlEpsgFactory
 # pending review
 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
-org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.LongitudeFirstFactory
 org.geotools.referencing.factory.URN_AuthorityFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.datum.DatumAuthorityFactory	(revision 35123)
@@ -1,6 +1,5 @@
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+org.geotools.referencing.factory.epsg.hsql.ThreadedHsqlEpsgFactory
 # pending review
 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
-org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.LongitudeFirstFactory
 org.geotools.referencing.factory.URN_AuthorityFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 35122)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.referencing.operation.CoordinateOperationAuthorityFactory	(revision 35123)
@@ -1,7 +1,6 @@
-org.geotools.referencing.factory.epsg.ThreadedHsqlEpsgFactory
+org.geotools.referencing.factory.epsg.hsql.ThreadedHsqlEpsgFactory
 # pending review
 # org.geotools.referencing.factory.epsg.HsqlDialectEpsgMediator
 org.geotools.referencing.factory.epsg.CoordinateOperationFactoryUsingWKT
-org.geotools.referencing.factory.epsg.DefaultFactory
 org.geotools.referencing.factory.epsg.LongitudeFirstFactory
 org.geotools.referencing.factory.URN_AuthorityFactory