Refactor Argeo Third Parties categories

[gpl/argeo-tp.git] / repackage / org.argeo.tp.earth / geotools / merge.bnd

diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index f02ff88a8784f9767461c98f6339aa5375ab80fe..3ad41412800c5ba1ae31f82d75744474078ce8a0 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",\
@@ -49,12 +49,13 @@ org.parboiled.test;resolution:="optional",\
 org.parboiled.transform;resolution:="optional",\
 org.parboiled.trees;resolution:="optional",\
 org.parboiled.*;resolution:="optional",\
+org.apache.commons.text.*;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, \