From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 9 Mar 2022 15:37:13 +0000 (+0100)
Subject: GeoTools usable on linear classpath
X-Git-Tag: v2.3.5~87
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=a4ce2b412ccebcd40cd54fa612455d17204a5dca;p=gpl%2Fargeo-slc.git

GeoTools usable on linear classpath
---

diff --git a/tp/org.argeo.tp.gis/geotools/merge.bnd b/tp/org.argeo.tp.gis/geotools/merge.bnd
index e34dfe310..12be4e28d 100644
--- a/tp/org.argeo.tp.gis/geotools/merge.bnd
+++ b/tp/org.argeo.tp.gis/geotools/merge.bnd
@@ -21,7 +21,6 @@ org.geotools:gt-coverage, \
 org.geotools:gt-referencing, \
 org.geotools:gt-process, \
 org.geotools:gt-epsg-extension, \
-org.geotools:gt-epsg-postgresql, \
 org.geotools:gt-epsg-wkt, \
 org.geotools:gt-transform, \
 org.geotools:gt-geojson, \
diff --git a/tp/org.argeo.tp.gis/units/merge.bnd b/tp/org.argeo.tp.gis/units/merge.bnd
index 58c69c79a..1bd06a91d 100644
--- a/tp/org.argeo.tp.gis/units/merge.bnd
+++ b/tp/org.argeo.tp.gis/units/merge.bnd
@@ -1,10 +1,14 @@
 Bundle-License: BSD-3-Clause
 Bundle-SymbolicName: tech.units.indriya
-SLC-Origin-M2: :2.1.3
+SLC-Origin-M2: :2.0.2
 Export-Package: javax.measure.*, tech.units.indriya.*
 Import-Package: \
 *;resolution:="optional"
 SLC-Origin-M2-Merge: \
-javax.measure:unit-api, \
+javax.measure:unit-api:2.0, \
 tech.units:indriya, \
-tech.uom.lib:uom-lib-common:2.1, \
\ No newline at end of file
+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, \