Changeset 35903 in osm for applications/editors


Ignore:
Timestamp:
2022-01-27T17:48:29+01:00 (3 years ago)
Author:
taylor.smock
Message:

geotools: run ant merge-geotools-services

This should fix the services issues seen in #21803.

This also updates geotools to 26.2.

Location:
applications/editors/josm/plugins/geotools
Files:
9 added
14 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/geotools/README

    r34513 r35903  
    44    * Licensed under GPL v3 (see LICENSE)
    55
    6 The current embedded version of GeoTools is 19.2.
     6The current embedded version of GeoTools is 26.2.
     7

  • applications/editors/josm/plugins/geotools/build.xml

    r35901 r35903  
    2828    </fileset>
    2929
    30     <target name="merge-geotools-services">
     30    <target name="merge-geotools-services" depends="fetch_dependencies">
    3131        <taskdef resource="org/pescuma/mergeservices/antlib.xml" classpath="tools/merge-services.jar" />
    3232        <delete dir="jar/META-INF/services"/>
    … …  
    3838            </fileset>
    3939        </merge-services>
     40        <echo>Check the updated files in jar/META-INF/services for lines where two
     41        services got merged. Example:
     42        org.geotools.coverage.util.FilterFunction_isCoverageorg.geotools.filter.AreaFunction
     43        </echo>
    4044    </target>
    4145
    … …  
    5862                <include name="META-INF/MANIFEST.MF"/>
    5963                <include name="META-INF/javax.media.jai.registryFile.jai"/>
    60                 <!-- Required by the JSR 385 implementation (indriya). See JOSM #21803 -->
    61                 <include name="META-INF/services/tech.units.indriya.spi.NumberSystem"/>
    62                 <include name="META-INF/services/org.geotools.*"/>
    63                 <include name="META-INF/services/org.opengis.*"/>
    6464            </zipfileset>
    6565        </jar>
    … …  
    7777                     see https://stackoverflow.com/a/18495658/2257172 -->
    7878            <attribute name="Specification-Title" value="JOSM GeoTools plugin"/>
    79             <attribute name="Specification-Version" value="22.0"/>
     79            <attribute name="Specification-Version" value="${gt.version}"/>
    8080            <attribute name="Specification-Vendor" value="JOSM developers" />
    8181            <attribute name="Implementation-Title" value="org.openstreetmap.josm.plugins.geotools" />
    82             <attribute name="Implementation-Version" value="22.0" />
     82            <attribute name="Implementation-Version" value="${gt.version}" />
    8383            <attribute name="Implementation-Vendor" value="JOSM developers"/>
    8484        </manifest>

  • applications/editors/josm/plugins/geotools/ivy_settings.xml

    r35898 r35903  
    11<?xml version="1.0" encoding="utf-8"?>
    22<ivysettings>
    3   <!--<include file="../../core/ivysettings.xml"/>-->
    4   <property name="gt.version" value="26.1"/> <!-- 26.1 -->
     3  <!-- When geotools is updated, run `ant merge-geotools-services` -->
     4  <property name="gt.version" value="26.2"/>
    55  <settings defaultResolver="ordered-resolvers"/>
    66  <resolvers>
    77    <chain name="ordered-resolvers">
     8      <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
    89      <ibiblio name="osgeo" m2compatible="true" root="https://repo.osgeo.org/repository/release/" />
    910      <ibiblio name="central" m2compatible="true" root="https://repo1.maven.org/maven2/" />
    10       <!--<ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />-->
    11       <!--<resolver ref="josm-nexus"/>-->
    1211    </chain>
    1312  </resolvers>

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

    r31599 r35903  
    1 org.hsqldb.jdbc.JDBCDriver
     1org.h2.Driverorg.hsqldb.jdbc.JDBCDriver

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

    r31744 r35903  
    11it.geosolutions.imageio.stream.input.spi.FileImageInputStreamExtImplSpi
    22it.geosolutions.imageio.stream.input.spi.URLImageInputStreamSpi
    3 it.geosolutions.imageio.stream.input.spi.StringImageInputStreamSpi
    4 
    5 #
     3it.geosolutions.imageio.stream.input.spi.StringImageInputStreamSpi#
    64# $RCSfile: javax.imageio.spi.ImageInputStreamSpi,v $
    75#

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

    r28946 r35903  
    1 it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi
    2 
    3 #
     1it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi#
    42# $RCSfile: javax.imageio.spi.ImageReaderSpi,v $
    53#

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

    r28946 r35903  
    11it.geosolutions.imageioimpl.plugins.tiff.TIFFImageWriterSpi
    2 
    32#
    43# $RCSfile: javax.imageio.spi.ImageWriterSpi,v $

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationRegistrySpi

    r28946 r35903  
    4646#
    4747com.sun.media.jai.imageioimpl.ImageReadWriteSpi
     48it.geosolutions.jaiext.crop.CropSpi

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/javax.media.jai.OperationsRegistrySpi

    r31599 r35903  
    1 org.jaitools.media.jai.contour.ContourSpi
    2 org.jaitools.media.jai.rangelookup.RangeLookupSpi
    3 org.jaitools.media.jai.vectorbinarize.VectorBinarizeSpi
    4 org.jaitools.media.jai.vectorize.VectorizeSpi
    51org.jaitools.media.jai.zonalstats.ZonalStatsSpi

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.data.DataStoreFactorySpi

    r35137 r35903  
     1org.geotools.data.h2.H2DataStoreFactory
     2org.geotools.data.h2.H2JNDIDataStoreFactory
    13org.geotools.data.shapefile.ShapefileDataStoreFactory
    24org.geotools.data.shapefile.ShapefileDirectoryFactory

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider

    r35123 r35903  
    4242org.geotools.referencing.operation.projection.NewZealandMapGrid$Provider
    4343org.geotools.referencing.operation.projection.Krovak$Provider
     44org.geotools.referencing.operation.projection.Krovak$NorthProvider
    4445org.geotools.referencing.operation.projection.CassiniSoldner$Provider
    4546org.geotools.referencing.operation.projection.EquidistantConic$Provider
    … …  
    5556org.geotools.referencing.operation.projection.WorldVanDerGrintenI$Provider
    5657org.geotools.referencing.operation.projection.Sinusoidal$Provider
     58org.geotools.referencing.operation.projection.Homolosine$Provider
    5759org.geotools.referencing.operation.projection.GeneralOblique$Provider
    5860org.geotools.referencing.operation.projection.MeteosatSG$Provider
    … …  
    6466org.geotools.referencing.operation.projection.CylindricalEqualArea$LambertCylindricalEqualAreaProvider
    6567org.geotools.referencing.operation.projection.EqualArea$Provider
     68

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.renderer.crs.ProjectionHandlerFactory

    r33930 r35903  
    55org.geotools.renderer.crs.LambertAzimuthalEqualAreaHandlerFactory
    66org.geotools.renderer.crs.ConicHandlerFactory
    7 org.geotools.renderer.crs.WorldVanDerGrintenIHandlerFactoryorg.geotools.renderer.crs.GeographicHandlerFactory
    8 org.geotools.renderer.crs.MercatorHandlerFactory
    9 org.geotools.renderer.crs.TransverseMercatorHandlerFactory
    10 org.geotools.renderer.crs.PolarStereographicHandlerFactory
    11 org.geotools.renderer.crs.LambertAzimuthalEqualAreaHandlerFactory
    12 org.geotools.renderer.crs.ConicHandlerFactory
    137org.geotools.renderer.crs.WorldVanDerGrintenIHandlerFactory
     8org.geotools.renderer.crs.AzimulthalEquidistantProjectionHandlerFactory
     9org.geotools.renderer.crs.HomolosineHandlerFactory
     10org.geotools.renderer.crs.OrthographicProjectionHandlerFactory

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.util.ConverterFactory

    r35137 r35903  
     1org.geotools.data.h2.H2ClobConverterFactory
    12org.geotools.data.util.CommonsConverterFactory
    23org.geotools.data.util.NumericConverterFactory
    … …  
    2021org.geotools.data.util.InterpolationConverterFactory
    2122org.geotools.data.util.LobConverterFactory
     23org.geotools.data.util.AbbreviatedTimeUnitConverterFactory

  • applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function

    r35129 r35903  
    22org.geotools.filter.AreaFunction
    33org.geotools.filter.LengthFunction
     4org.geotools.filter.function.ArrayFunction
    45org.geotools.filter.function.AttributeCountFunction
    56org.geotools.filter.function.CategorizeFunction
    … …  
    2122org.geotools.filter.function.EnvFunction
    2223org.geotools.filter.function.StringTemplateFunction
     24org.geotools.filter.function.InArrayFunction
    2325org.geotools.filter.function.FilterFunction_contains
    2426org.geotools.filter.function.FilterFunction_isEmpty
    … …  
    141143org.geotools.filter.function.IDFunction
    142144org.geotools.filter.function.InterpolateFunction
     145org.geotools.filter.function.MapGetFunction
    143146org.geotools.filter.function.RecodeFunction
    144147org.geotools.filter.function.math.FilterFunction_IEEEremainder
    … …  
    199202org.geotools.filter.function.BoundedByFunction
    200203org.geotools.filter.function.DateDifferenceFunction
    201 # Disabled for JOSM as it requires com.fasterxml.jackson.core.JsonFactory
    202 #org.geotools.filter.function.JsonPointerFunction
     204org.geotools.filter.function.JsonPointerFunction
     205org.geotools.filter.function.AndFunction
     206org.geotools.filter.function.OrFunction
     207org.geotools.filter.function.NowFunction
     208org.geotools.filter.function.BandsFunction
Note: See TracChangeset for help on using the changeset viewer.