Update GeoTools (breaking API changes)

[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 ba066ea9caef664a15e4f17f6a39c12836d6862c..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: :28.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",\
@@ -36,14 +36,25 @@ org.eclipse.*;resolution:="optional",\
 org.jaitools.*;resolution:="optional",\
 org.jdom2.*;resolution:="optional",\
 org.junit.*;resolution:="optional",\
-org.parboiled.*;resolution:="optional",\
 org.picocontainer.*;resolution:="optional",\
+org.parboiled.annotations;resolution:="optional",\
+org.parboiled.buffers;resolution:="optional",\
+org.parboiled.common;resolution:="optional",\
+org.parboiled.errors;resolution:="optional",\
+org.parboiled.matchers;resolution:="optional",\
+org.parboiled.matchervisitors;resolution:="optional",\
+org.parboiled.parserunners;resolution:="optional",\
+org.parboiled.support;resolution:="optional",\
+org.parboiled.test;resolution:="optional",\
+org.parboiled.transform;resolution:="optional",\
+org.parboiled.trees;resolution:="optional",\
+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, \
@@ -89,3 +100,6 @@ org.geotools.ogc:net.opengis.wfs, \
 org.geotools.ogc:net.opengis.wmts, \
 org.geotools.ogc:net.opengis.fes, \
 org.geotools.ogc:org.w3.xlink, \
+org.picocontainer:picocontainer:1.2, \
+
+# Note: PicoContainer (v1.2) is needed for dependency injection by GeooTools XSD (GML, etc.)