Upgrade GeoTools, downgrade units

diff --git a/tp/org.argeo.tp.gis/geotools/merge.bnd b/tp/org.argeo.tp.gis/geotools/merge.bnd
index 8c4c523f1e3e1af65738d541687bed00ef2b2ba5..60ceeb09a0e182c039b6f5230790e71dd6f0a1ce 100644 (file)
--- a/tp/org.argeo.tp.gis/geotools/merge.bnd
+++ b/tp/org.argeo.tp.gis/geotools/merge.bnd
@@ -1,6 +1,6 @@
 Bundle-License: LGPL-2.1-only
 Bundle-SymbolicName: org.geotools
-SLC-Origin-M2: :26.4
+SLC-Origin-M2: :27.0
 SLC-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
 Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
 Import-Package: \

diff --git a/tp/org.argeo.tp.gis/units/merge.bnd b/tp/org.argeo.tp.gis/units/merge.bnd
index 4a043176ec77f97d77940785320d6980dfbba766..75ecae16a612e8cf03815f4a0f03398b42bbe2b3 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.1.3
+SLC-Origin-M2: :2.0.4
 Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
 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, \
-si.uom:si-units:2.1, \
-si.uom:si-quantity:2.1, \
-systems.uom:systems-common:2.1, \
-systems.uom:systems-quantity:2.1, \
+tech.uom.lib:uom-lib-common:2.0.1, \
+si.uom:si-units:2.0, \
+si.uom:si-quantity:2.0.1, \
+systems.uom:systems-common:2.0.2, \
+systems.uom:systems-quantity:2.0.2, \