From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 9 Nov 2023 11:18:19 +0000 (+0100)
Subject: Merge tag 'v2.3.16' into testing
X-Git-Tag: v2.1.34~2
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=e6a895f8c1374d96da752c7097f62bd9858a5aa4;hp=0956ab175dc0862d21a0c2418351312715681842;p=gpl%2Fargeo-tp.git

Merge tag 'v2.3.16' into testing
---

diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index f02ff88..0904371 100644
--- a/repackage/org.argeo.tp.earth/geotools/merge.bnd
+++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd
@@ -1,9 +1,9 @@
 SPDX-License-Identifier: LGPL-2.1-only
 Bundle-SymbolicName: org.geotools
-Argeo-Origin-M2: :29.2
+Argeo-Origin-M2: :30.0
 Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
 
-Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
+Export-Package: org.geotools.*, org.w3.xlink.*
 
 Import-Package: \
 org.geotools.gui.swing.*;resolution:="optional",\
@@ -52,9 +52,9 @@ org.parboiled.*;resolution:="optional",\
 *
 
 Argeo-Origin-M2-Merge: \
+org.geotools:gt-api, \
 org.geotools:gt-metadata, \
 org.geotools:gt-property, \
-org.geotools:gt-opengis, \
 org.geotools:gt-main, \
 org.geotools:gt-cql, \
 org.geotools:gt-http, \
diff --git a/repackage/org.argeo.tp/com.sun.jna.platform.bnd b/repackage/org.argeo.tp/com.sun.jna.platform.bnd
new file mode 100644
index 0000000..bf2e305
--- /dev/null
+++ b/repackage/org.argeo.tp/com.sun.jna.platform.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
+Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.13.0
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 292c670..4cfe309 100644
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,4 +1,4 @@
 major=2
 minor=3
-micro=15
+micro=16
 qualifier=