From ddf81cbac7207a60e5c30adf04ddcba3b6b56a93 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 24 May 2022 13:43:55 +0200 Subject: [PATCH] Upgrade GeoTools, downgrade units --- tp/org.argeo.tp.gis/geotools/merge.bnd | 2 +- tp/org.argeo.tp.gis/units/merge.bnd | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tp/org.argeo.tp.gis/geotools/merge.bnd b/tp/org.argeo.tp.gis/geotools/merge.bnd index 8c4c523f1..60ceeb09a 100644 --- 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 4a043176e..75ecae16a 100644 --- 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, \ -- 2.30.2