Index: applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- applications/editors/josm/plugins/geotools/.classpath	(revision 35136)
+++ applications/editors/josm/plugins/geotools/.classpath	(revision 35137)
@@ -28,14 +28,4 @@
 	</classpathentry>
 	<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-imagemosaic-22.0.jar" sourcepath="lib/gt-imagemosaic-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-jdbc-h2-22.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
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 35136)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.GridFormatFactorySpi	(revision 35137)
@@ -1,2 +1,1 @@
 org.geotools.gce.geotiff.GeoTiffFormatFactorySpi
-org.geotools.gce.imagemosaic.ImageMosaicFormatFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.footprint.FootprintLoaderSpi
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.footprint.FootprintLoaderSpi	(revision 35136)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.coverage.grid.io.footprint.FootprintLoaderSpi	(revision 35137)
@@ -1,3 +1,2 @@
 org.geotools.coverage.grid.io.footprint.WKBLoaderSPI
 org.geotools.coverage.grid.io.footprint.WKTLoaderSPI
-org.geotools.gce.imagemosaic.catalog.ShapefileLoaderSPI
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 35136)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi	(revision 35137)
@@ -1,4 +1,2 @@
-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.gce.imagemosaic.acceptors.GranuleAcceptorFactorySPI
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.acceptors.GranuleAcceptorFactorySPI	(revision 35136)
+++ 	(revision )
@@ -1,2 +1,0 @@
-org.geotools.gce.imagemosaic.acceptors.DefaultGranuleAcceptorFactory
-org.geotools.gce.imagemosaic.acceptors.HeterogeneousCRSAcceptorFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.granulecollector.SubmosaicProducerFactory
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.granulecollector.SubmosaicProducerFactory	(revision 35136)
+++ 	(revision )
@@ -1,2 +1,0 @@
-org.geotools.gce.imagemosaic.granulecollector.DefaultSubmosaicProducerFactory
-org.geotools.gce.imagemosaic.granulecollector.ReprojectingSubmosaicProducerFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.granulehandler.GranuleHandlerFactorySPI
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.granulehandler.GranuleHandlerFactorySPI	(revision 35136)
+++ 	(revision )
@@ -1,2 +1,0 @@
-org.geotools.gce.imagemosaic.granulehandler.DefaultGranuleHandlerFactory
-org.geotools.gce.imagemosaic.granulehandler.ReprojectingGranuleHandlerFactory
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.namecollector.CoverageNameCollectorSPI
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.namecollector.CoverageNameCollectorSPI	(revision 35136)
+++ 	(revision )
@@ -1,3 +1,0 @@
-org.geotools.gce.imagemosaic.namecollector.DefaultCoverageNameCollectorSPI
-org.geotools.gce.imagemosaic.namecollector.ColorSpaceNameCollectorSPI
-org.geotools.gce.imagemosaic.namecollector.FileNameRegexNameCollectorSPI
Index: applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.properties.PropertiesCollectorSPI
===================================================================
--- applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.gce.imagemosaic.properties.PropertiesCollectorSPI	(revision 35136)
+++ 	(revision )
@@ -1,16 +1,0 @@
-org.geotools.gce.imagemosaic.properties.time.TimestampFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.numeric.ByteFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.numeric.IntegerFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.numeric.ShortFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.numeric.LongFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.numeric.FloatFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.numeric.DoubleFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.string.StringFileNameExtractorSPI
-org.geotools.gce.imagemosaic.properties.CRSExtractorSPI
-org.geotools.gce.imagemosaic.properties.ResolutionExtractorSPI
-org.geotools.gce.imagemosaic.properties.ResolutionXExtractorSPI
-org.geotools.gce.imagemosaic.properties.ResolutionYExtractorSPI
-org.geotools.gce.imagemosaic.properties.DateExtractorSPI
-org.geotools.gce.imagemosaic.properties.FSDateExtractorSPI
-org.geotools.gce.imagemosaic.properties.CurrentDateExtractorSPI
-
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 35136)
+++ applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory	(revision 35137)
@@ -1,3 +1,2 @@
-org.geotools.data.h2.H2ClobConverterFactory
 org.geotools.data.util.CommonsConverterFactory
 org.geotools.data.util.NumericConverterFactory