Update and extend GIS components

diff --git a/tp/org.argeo.tp.gis/geotools/merge.bnd b/tp/org.argeo.tp.gis/geotools/merge.bnd
index 891958b0a2ed2afcac1d92f09b6c226fa411040b..10f2a2516e3399038aa0da9132924466be35e52a 100644 (file)
--- a/tp/org.argeo.tp.gis/geotools/merge.bnd
+++ b/tp/org.argeo.tp.gis/geotools/merge.bnd
@@ -26,20 +26,40 @@ org.geotools:gt-referencing, \
 org.geotools:gt-process, \
 org.geotools:gt-epsg-extension, \
 org.geotools:gt-epsg-wkt, \
+org.geotools:gt-epsg-postgresql, \
 org.geotools:gt-transform, \
 org.geotools:gt-geojson, \
 org.geotools:gt-shapefile, \
 org.geotools:gt-xml, \
 org.geotools:gt-svg, \
+org.geotools:gt-brewer, \
+org.geotools:gt-css, \
 org.geotools:gt-image, \
 org.geotools:gt-geotiff, \
 org.geotools:gt-render, \
 org.geotools:gt-swing, \
+org.geotools:gt-wfs-ng, \
 org.geotools:gt-wms, \
+org.geotools:gt-wmts, \
 org.geotools:gt-jdbc, \
+org.geotools:gt-complex, \
+org.geotools:gt-app-schema, \
+org.geotools:gt-app-schema-resolver, \
+org.geotools:gt-gml-geometry-streaming, \
+org.geotools:gt-tile-client, \
 org.geotools.jdbc:gt-jdbc-postgis, \
 org.geotools.jdbc:gt-jdbc-h2, \
+org.geotools.xsd:gt-xsd-core, \
+org.geotools.xsd:gt-xsd-filter, \
+org.geotools.xsd:gt-xsd-ows, \
+org.geotools.xsd:gt-xsd-fes, \
+org.geotools.xsd:gt-xsd-gml2, \
+org.geotools.xsd:gt-xsd-gml3, \
+org.geotools.xsd:gt-xsd-wfs, \
+org.geotools.xsd:gt-xsd-wmts, \
+org.geotools.xsd:gt-xsd-sld, \
 org.geotools.ogc:net.opengis.ows, \
 org.geotools.ogc:net.opengis.wfs, \
+org.geotools.ogc:net.opengis.wmts, \
 org.geotools.ogc:net.opengis.fes, \
 org.geotools.ogc:org.w3.xlink, \

diff --git a/tp/org.argeo.tp.gis/units/merge.bnd b/tp/org.argeo.tp.gis/units/merge.bnd
index 2a404864d57df235f34db62fc9da3f420eeaf7c1..4a043176ec77f97d77940785320d6980dfbba766 100644 (file)
--- a/tp/org.argeo.tp.gis/units/merge.bnd
+++ b/tp/org.argeo.tp.gis/units/merge.bnd
@@ -1,14 +1,14 @@
 Bundle-License: BSD-3-Clause
 Bundle-SymbolicName: tech.units.indriya
-SLC-Origin-M2: :2.0.2
+SLC-Origin-M2: :2.1.3
 Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
 Import-Package: \
 *;resolution:="optional"
 SLC-Origin-M2-Merge: \
-javax.measure:unit-api:2.0, \
+javax.measure:unit-api, \
 tech.units:indriya, \
-tech.uom.lib:uom-lib-common:2.0, \
-si.uom:si-units:2.0.1, \
-si.uom:si-quantity:2.0.1, \
-systems.uom:systems-common:2.0.2, \
-systems.uom:systems-quantity:2.0.2, \
+tech.uom.lib:uom-lib-common:2.1, \
+si.uom:si-units:2.1, \
+si.uom:si-quantity:2.1, \
+systems.uom:systems-common:2.1, \
+systems.uom:systems-quantity:2.1, \