Changeset 35906 in osm for applications/editors

Timestamp:

2022-02-02T14:57:26+01:00 (3 years ago)

Author:

taylor.smock

Message:

fix #21815: ClassNotFound CogSourceSPIProvider

Location:

applications/editors/josm/plugins/geotools

Files:

• ivy.xml (modified) (1 diff)
• jar/META-INF/services/java.sql.Driver (modified) (1 diff)
• jar/META-INF/services/javax.cache.spi.CachingProvider (added)
• jar/META-INF/services/javax.imageio.spi.ImageInputStreamSpi (modified) (1 diff)
• jar/META-INF/services/javax.imageio.spi.ImageReaderSpi (modified) (1 diff)
• jar/META-INF/services/javax.measure.spi.ServiceProvider (modified) (1 diff)
• jar/META-INF/services/org.ehcache.core.spi.service.ServiceFactory (added)
• jar/META-INF/services/org.ehcache.xml.CacheManagerServiceConfigurationParser (added)
• jar/META-INF/services/org.ehcache.xml.CacheServiceConfigurationParser (added)

applications/editors/josm/plugins/geotools/ivy.xml

@@ -21 +21 @@
         <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"/>

applications/editors/josm/plugins/geotools/jar/META-INF/services/java.sql.Driver

@@ -1 @@
-org.h2.Driverorg.hsqldb.jdbc.JDBCDriver
+org.h2.Driver
+org.hsqldb.jdbc.JDBCDriver

applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageInputStreamSpi

@@ +1 @@
+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 $
 #

applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.imageio.spi.ImageReaderSpi

@@ -1 @@
-it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi#
+it.geosolutions.imageioimpl.plugins.cog.CogImageReaderSpi
+it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi
+#
 # $RCSfile: javax.imageio.spi.ImageReaderSpi,v $
 #

applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.measure.spi.ServiceProvider

@@ -1 @@
-tech.units.indriya.spi.DefaultServiceProvidersi.uom.SIServiceProvider
+tech.units.indriya.spi.DefaultServiceProvider
+si.uom.SIServiceProvider
 systems.uom.common.spi.CommonServiceProvider