Index: /applications/editors/josm/plugins/geotools/ivy.xml
===================================================================
--- /applications/editors/josm/plugins/geotools/ivy.xml	(revision 35905)
+++ /applications/editors/josm/plugins/geotools/ivy.xml	(revision 35906)
@@ -21,7 +21,4 @@
         <exclude org="com.github.spotbugs"/>
         <exclude org="org.geotools.demo"/>
-        <!-- Large dependencies to avoid until someone needs them -->
-        <!-- Excluded due to depending upon ehcache, which is 1.6M -->
-        <exclude org="it.geosolutions.imageio-ext" module="imageio-ext-cog-reader" />
         <!-- ecore is rather large (1.3M) -->
         <exclude org="org.eclipse.emf"/>
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 35905)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver	(revision 35906)
@@ -1,1 +1,2 @@
-org.h2.Driverorg.hsqldb.jdbc.JDBCDriver
+org.h2.Driver
+org.hsqldb.jdbc.JDBCDriver
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.cache.spi.CachingProvider
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.cache.spi.CachingProvider	(revision 35906)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.cache.spi.CachingProvider	(revision 35906)
@@ -0,0 +1,1 @@
+org.ehcache.jsr107.EhcacheCachingProvider
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 35905)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageInputStreamSpi	(revision 35906)
@@ -1,5 +1,7 @@
+it.geosolutions.imageioimpl.plugins.cog.CogImageInputStreamSpi
 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 35905)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageOutputStreamSpi	(revision 35906)
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 35905)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageReaderSpi	(revision 35906)
@@ -1,3 +1,5 @@
-it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi#
+it.geosolutions.imageioimpl.plugins.cog.CogImageReaderSpi
+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 35905)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageWriterSpi	(revision 35906)
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 35905)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.ServiceProvider	(revision 35906)
@@ -1,2 +1,3 @@
-tech.units.indriya.spi.DefaultServiceProvidersi.uom.SIServiceProvider
+tech.units.indriya.spi.DefaultServiceProvider
+si.uom.SIServiceProvider
 systems.uom.common.spi.CommonServiceProvider
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.core.spi.service.ServiceFactory
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.core.spi.service.ServiceFactory	(revision 35906)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.core.spi.service.ServiceFactory	(revision 35906)
@@ -0,0 +1,17 @@
+org.ehcache.impl.internal.store.heap.OnHeapStoreProviderFactory
+org.ehcache.impl.internal.store.offheap.OffHeapStoreProviderFactory
+org.ehcache.impl.internal.store.disk.OffHeapDiskStoreProviderFactory
+org.ehcache.impl.internal.store.tiering.TieredStoreProviderFactory
+org.ehcache.impl.internal.store.tiering.CompoundCachingTierProviderFactory
+org.ehcache.impl.internal.TimeSourceServiceFactory
+org.ehcache.impl.internal.spi.serialization.DefaultSerializationProviderFactory
+org.ehcache.impl.internal.spi.loaderwriter.DefaultCacheLoaderWriterProviderFactory
+org.ehcache.impl.internal.spi.event.DefaultCacheEventListenerProviderFactory
+org.ehcache.impl.internal.executor.DefaultExecutionServiceFactory
+org.ehcache.impl.internal.persistence.DefaultLocalPersistenceServiceFactory
+org.ehcache.impl.internal.persistence.DefaultDiskResourceServiceFactory
+org.ehcache.impl.internal.loaderwriter.writebehind.WriteBehindProviderFactory
+org.ehcache.impl.internal.events.CacheEventNotificationListenerServiceProviderFactory
+org.ehcache.impl.internal.spi.copy.DefaultCopyProviderFactory
+org.ehcache.impl.internal.sizeof.DefaultSizeOfEngineProviderFactory
+org.ehcache.impl.internal.statistics.DefaultStatisticsServiceFactory
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.xml.CacheManagerServiceConfigurationParser
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.xml.CacheManagerServiceConfigurationParser	(revision 35906)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.xml.CacheManagerServiceConfigurationParser	(revision 35906)
@@ -0,0 +1,1 @@
+org.ehcache.jsr107.internal.Jsr107ServiceConfigurationParser
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.xml.CacheServiceConfigurationParser
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.xml.CacheServiceConfigurationParser	(revision 35906)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.ehcache.xml.CacheServiceConfigurationParser	(revision 35906)
@@ -0,0 +1,16 @@
+#
+# Copyright Terracotta, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+org.ehcache.jsr107.internal.Jsr107CacheConfigurationParser