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 f02ff88a8784f9767461c98f6339aa5375ab80fe..0904371f40311fa0f4dbd7ced8daef106a910434 100644 (file)
--- 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 (file)
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 292c670d376fbf3112e2e71edac2eed23231f347..4cfe3093e4c5cdef5862acb85f9f00d1bb033363 100644 (file)
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,4 +1,4 @@
 major=2
 minor=3
-micro=15
+micro=16
 qualifier=