From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 23 Mar 2023 07:51:07 +0000 (+0100)
Subject: Reshuffle TP categories
X-Git-Tag: v2.3.12~13
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=3a09bd935d6260a3f4a346f52370ebc46da42ae4

Reshuffle TP categories
---

diff --git a/repackage/Makefile b/repackage/Makefile
index bfee248..843a42c 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -16,11 +16,13 @@ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.tp \
-org.argeo.tp.jetty \
+org.argeo.tp.httpd \
 org.argeo.tp.utils \
+org.argeo.tp.publish \
+org.argeo.tp.math \
 org.argeo.tp.jcr \
-org.argeo.tp.poi \
-org.argeo.tp.gis \
+org.argeo.tp.office \
+org.argeo.tp.earth \
 crypto/full/org.argeo.tp.crypto \
 crypto/fips/org.argeo.tp.crypto \
 
diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
new file mode 100644
index 0000000..72c3760
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd
@@ -0,0 +1,93 @@
+SPDX-License-Identifier: LGPL-2.1-only
+Bundle-SymbolicName: org.geotools
+Argeo-Origin-M2: :28.2
+Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
+
+Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
+
+Import-Package: \
+org.geotools.gui.swing.*;resolution:="optional",\
+org.locationtech.jts.*,\
+org.geotools.*,\
+org.opengis.*,\
+net.opengis.*,\
+javax.measure.*, \
+tech.units.indriya.*, \
+si.uom.*, \
+systems.uom.*, \
+org.ejml.*,\
+au.com.objectix.*;resolution:="optional",\
+ch.qos.logback.*;resolution:="optional",\
+com.conversantmedia.*;resolution:="optional",\
+com.google.re2j.*;resolution:="optional",\
+com.sun.media.*;resolution:="optional",\
+com.sun.medialib.*;resolution:="optional",\
+geodb.*;resolution:="optional",\
+it.geosolutions.*;resolution:="optional",\
+javax.imageio.*;resolution:="optional",\
+javax.media.*;resolution:="optional",\
+javax.sql.*;resolution:="optional",\
+javax.swing.*;resolution:="optional",\
+net.miginfocom.*;resolution:="optional",\
+net.sf.geographiclib.*;resolution:="optional",\
+org.apache.log4j.*;resolution:="optional",\
+org.apache.logging.log4j.*;resolution:="optional",\
+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.apache.commons.digester.*;resolution:="optional",\
+org.apache.commons.pool.*;resolution:="optional",\
+*
+
+Argeo-Origin-M2-Merge: \
+org.geotools:gt-metadata, \
+org.geotools:gt-property, \
+org.geotools:gt-opengis, \
+org.geotools:gt-main, \
+org.geotools:gt-cql, \
+org.geotools:gt-http, \
+org.geotools:gt-coverage, \
+org.geotools:gt-referencing, \
+org.geotools:gt-process, \
+org.geotools:gt-epsg-extension, \
+org.geotools:gt-epsg-wkt, \
+org.geotools:gt-transform, \
+org.geotools:gt-geojson-core, \
+org.geotools:gt-geojson-store, \
+org.geotools:gt-shapefile, \
+org.geotools:gt-xml, \
+org.geotools:gt-svg, \
+org.geotools:gt-brewer, \
+org.geotools:gt-css, \
+org.geotools:gt-image, \
+org.geotools:gt-geotiff, \
+org.geotools:gt-render, \
+org.geotools:gt-swing, \
+org.geotools:gt-wfs-ng, \
+org.geotools:gt-wms, \
+org.geotools:gt-wmts, \
+org.geotools:gt-jdbc, \
+org.geotools:gt-complex, \
+org.geotools:gt-app-schema, \
+org.geotools:gt-app-schema-resolver, \
+org.geotools:gt-gml-geometry-streaming, \
+org.geotools:gt-tile-client, \
+org.geotools.jdbc:gt-jdbc-postgis, \
+org.geotools.jdbc:gt-jdbc-h2, \
+org.geotools.xsd:gt-xsd-core, \
+org.geotools.xsd:gt-xsd-filter, \
+org.geotools.xsd:gt-xsd-ows, \
+org.geotools.xsd:gt-xsd-fes, \
+org.geotools.xsd:gt-xsd-gml2, \
+org.geotools.xsd:gt-xsd-gml3, \
+org.geotools.xsd:gt-xsd-wfs, \
+org.geotools.xsd:gt-xsd-wmts, \
+org.geotools.xsd:gt-xsd-sld, \
+org.geotools.ogc:net.opengis.ows, \
+org.geotools.ogc:net.opengis.wfs, \
+org.geotools.ogc:net.opengis.wmts, \
+org.geotools.ogc:net.opengis.fes, \
+org.geotools.ogc:org.w3.xlink, \
diff --git a/repackage/org.argeo.tp.earth/h2gis/common.bnd b/repackage/org.argeo.tp.earth/h2gis/common.bnd
new file mode 100644
index 0000000..8be57e7
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/h2gis/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-3.0-or-later
+Argeo-Origin-M2: :2.2.0
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.api.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.api.bnd
new file mode 100644
index 0000000..dd596a9
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.api.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.orbisgis:h2gis-api
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd
new file mode 100644
index 0000000..0febb55
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.orbisgis:h2gis
+Fragment-Host: org.h2
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.postgis_jts.bnd
new file mode 100644
index 0000000..4f6db00
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.postgis_jts.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.orbisgis:postgis-jts
+Fragment-Host: org.h2
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.utilities.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.utilities.bnd
new file mode 100644
index 0000000..a90e36b
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.utilities.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.orbisgis:h2gis-utilities
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/org.cts.bnd b/repackage/org.argeo.tp.earth/org.cts.bnd
new file mode 100644
index 0000000..ec4c2c1
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/org.cts.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: LGPL-3.0-or-later
+Argeo-Origin-M2: org.orbisgis:cts:1.7.0
+# TODO: 1.7.0 sources are missing in Maven central
diff --git a/repackage/org.argeo.tp.earth/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.earth/org.locationtech.spatial4j.bnd
new file mode 100644
index 0000000..fe983a8
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/org.locationtech.spatial4j.bnd
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8
+
+Import-Package:\
+org.noggit;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/org.poly2tri.bnd b/repackage/org.argeo.tp.earth/org.poly2tri.bnd
new file mode 100644
index 0000000..61a9634
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/org.poly2tri.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.orbisgis:poly2tri:0.4.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/common.bnd b/repackage/org.argeo.tp.earth/postgis/common.bnd
new file mode 100644
index 0000000..fa61071
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/postgis/common.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: LGPL-2.1-only
+Argeo-Origin-M2: :2021.1.0
+Export-Package: net.postgis.*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.bnd
new file mode 100644
index 0000000..ca4423f
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-jdbc
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.geometry.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.geometry.bnd
new file mode 100644
index 0000000..5874235
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.geometry.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-geometry
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.java2d.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.java2d.bnd
new file mode 100644
index 0000000..fd94fc5
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.java2d.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-jdbc-java2d
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.jts.bnd b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.jts.bnd
new file mode 100644
index 0000000..f27d562
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/postgis/net.postgis.jdbc.jts.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: net.postgis:postgis-jdbc-jts
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/ejml/merge.bnd b/repackage/org.argeo.tp.gis/ejml/merge.bnd
deleted file mode 100644
index d027b3d..0000000
--- a/repackage/org.argeo.tp.gis/ejml/merge.bnd
+++ /dev/null
@@ -1,17 +0,0 @@
-Bundle-SymbolicName: org.ejml
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :0.42
-Export-Package: org.ejml.*
-Argeo-Origin-M2-Merge: \
-org.ejml:ejml-core, \
-org.ejml:ejml-simple, \
-org.ejml:ejml-fdense, \
-org.ejml:ejml-ddense, \
-org.ejml:ejml-cdense, \
-org.ejml:ejml-zdense, \
-org.ejml:ejml-dsparse, \
-
-Import-Package: \
-us.hebi.matlab.*;resolution:="optional", \
-javax.swing;resolution:="optional",
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/geotools/merge.bnd b/repackage/org.argeo.tp.gis/geotools/merge.bnd
deleted file mode 100644
index 72c3760..0000000
--- a/repackage/org.argeo.tp.gis/geotools/merge.bnd
+++ /dev/null
@@ -1,93 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1-only
-Bundle-SymbolicName: org.geotools
-Argeo-Origin-M2: :28.2
-Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
-
-Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
-
-Import-Package: \
-org.geotools.gui.swing.*;resolution:="optional",\
-org.locationtech.jts.*,\
-org.geotools.*,\
-org.opengis.*,\
-net.opengis.*,\
-javax.measure.*, \
-tech.units.indriya.*, \
-si.uom.*, \
-systems.uom.*, \
-org.ejml.*,\
-au.com.objectix.*;resolution:="optional",\
-ch.qos.logback.*;resolution:="optional",\
-com.conversantmedia.*;resolution:="optional",\
-com.google.re2j.*;resolution:="optional",\
-com.sun.media.*;resolution:="optional",\
-com.sun.medialib.*;resolution:="optional",\
-geodb.*;resolution:="optional",\
-it.geosolutions.*;resolution:="optional",\
-javax.imageio.*;resolution:="optional",\
-javax.media.*;resolution:="optional",\
-javax.sql.*;resolution:="optional",\
-javax.swing.*;resolution:="optional",\
-net.miginfocom.*;resolution:="optional",\
-net.sf.geographiclib.*;resolution:="optional",\
-org.apache.log4j.*;resolution:="optional",\
-org.apache.logging.log4j.*;resolution:="optional",\
-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.apache.commons.digester.*;resolution:="optional",\
-org.apache.commons.pool.*;resolution:="optional",\
-*
-
-Argeo-Origin-M2-Merge: \
-org.geotools:gt-metadata, \
-org.geotools:gt-property, \
-org.geotools:gt-opengis, \
-org.geotools:gt-main, \
-org.geotools:gt-cql, \
-org.geotools:gt-http, \
-org.geotools:gt-coverage, \
-org.geotools:gt-referencing, \
-org.geotools:gt-process, \
-org.geotools:gt-epsg-extension, \
-org.geotools:gt-epsg-wkt, \
-org.geotools:gt-transform, \
-org.geotools:gt-geojson-core, \
-org.geotools:gt-geojson-store, \
-org.geotools:gt-shapefile, \
-org.geotools:gt-xml, \
-org.geotools:gt-svg, \
-org.geotools:gt-brewer, \
-org.geotools:gt-css, \
-org.geotools:gt-image, \
-org.geotools:gt-geotiff, \
-org.geotools:gt-render, \
-org.geotools:gt-swing, \
-org.geotools:gt-wfs-ng, \
-org.geotools:gt-wms, \
-org.geotools:gt-wmts, \
-org.geotools:gt-jdbc, \
-org.geotools:gt-complex, \
-org.geotools:gt-app-schema, \
-org.geotools:gt-app-schema-resolver, \
-org.geotools:gt-gml-geometry-streaming, \
-org.geotools:gt-tile-client, \
-org.geotools.jdbc:gt-jdbc-postgis, \
-org.geotools.jdbc:gt-jdbc-h2, \
-org.geotools.xsd:gt-xsd-core, \
-org.geotools.xsd:gt-xsd-filter, \
-org.geotools.xsd:gt-xsd-ows, \
-org.geotools.xsd:gt-xsd-fes, \
-org.geotools.xsd:gt-xsd-gml2, \
-org.geotools.xsd:gt-xsd-gml3, \
-org.geotools.xsd:gt-xsd-wfs, \
-org.geotools.xsd:gt-xsd-wmts, \
-org.geotools.xsd:gt-xsd-sld, \
-org.geotools.ogc:net.opengis.ows, \
-org.geotools.ogc:net.opengis.wfs, \
-org.geotools.ogc:net.opengis.wmts, \
-org.geotools.ogc:net.opengis.fes, \
-org.geotools.ogc:org.w3.xlink, \
diff --git a/repackage/org.argeo.tp.gis/h2gis/common.bnd b/repackage/org.argeo.tp.gis/h2gis/common.bnd
deleted file mode 100644
index 8be57e7..0000000
--- a/repackage/org.argeo.tp.gis/h2gis/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: LGPL-3.0-or-later
-Argeo-Origin-M2: :2.2.0
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd
deleted file mode 100644
index dd596a9..0000000
--- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.api.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.orbisgis:h2gis-api
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd
deleted file mode 100644
index 0febb55..0000000
--- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.orbisgis:h2gis
-Fragment-Host: org.h2
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd
deleted file mode 100644
index 4f6db00..0000000
--- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.orbisgis:postgis-jts
-Fragment-Host: org.h2
diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd
deleted file mode 100644
index a90e36b..0000000
--- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.utilities.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.orbisgis:h2gis-utilities
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/org.cts.bnd b/repackage/org.argeo.tp.gis/org.cts.bnd
deleted file mode 100644
index ec4c2c1..0000000
--- a/repackage/org.argeo.tp.gis/org.cts.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: LGPL-3.0-or-later
-Argeo-Origin-M2: org.orbisgis:cts:1.7.0
-# TODO: 1.7.0 sources are missing in Maven central
diff --git a/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd b/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd
deleted file mode 100644
index b163e3a..0000000
--- a/repackage/org.argeo.tp.gis/org.locationtech.jts.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd
deleted file mode 100644
index fe983a8..0000000
--- a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8
-
-Import-Package:\
-org.noggit;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/org.poly2tri.bnd b/repackage/org.argeo.tp.gis/org.poly2tri.bnd
deleted file mode 100644
index 61a9634..0000000
--- a/repackage/org.argeo.tp.gis/org.poly2tri.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.orbisgis:poly2tri:0.4.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/common.bnd b/repackage/org.argeo.tp.gis/postgis/common.bnd
deleted file mode 100644
index fa61071..0000000
--- a/repackage/org.argeo.tp.gis/postgis/common.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1-only
-Argeo-Origin-M2: :2021.1.0
-Export-Package: net.postgis.*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd
deleted file mode 100644
index ca4423f..0000000
--- a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: net.postgis:postgis-jdbc
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd
deleted file mode 100644
index 5874235..0000000
--- a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.geometry.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: net.postgis:postgis-geometry
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd
deleted file mode 100644
index fd94fc5..0000000
--- a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.java2d.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: net.postgis:postgis-jdbc-java2d
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd b/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd
deleted file mode 100644
index f27d562..0000000
--- a/repackage/org.argeo.tp.gis/postgis/net.postgis.jdbc.jts.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: net.postgis:postgis-jdbc-jts
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.gis/units/merge.bnd b/repackage/org.argeo.tp.gis/units/merge.bnd
deleted file mode 100644
index efdf074..0000000
--- a/repackage/org.argeo.tp.gis/units/merge.bnd
+++ /dev/null
@@ -1,14 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Bundle-SymbolicName: tech.units.indriya
-Argeo-Origin-M2: :2.0.4
-Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
-Import-Package: \
-*;resolution:="optional"
-Argeo-Origin-M2-Merge: \
-javax.measure:unit-api:2.0, \
-tech.units:indriya, \
-tech.uom.lib:uom-lib-common:2.0.1, \
-si.uom:si-units:2.0.1, \
-si.uom:si-quantity:2.0.1, \
-systems.uom:systems-common:2.0.2, \
-systems.uom:systems-quantity:2.0.2, \
diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
new file mode 100644
index 0000000..7bed46c
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
@@ -0,0 +1,22 @@
+Bundle-SymbolicName: org.eclipse.jetty.websocket
+SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
+Argeo-Origin-M2: :10.0.14
+Argeo-Origin-M2-Merge: \
+org.eclipse.jetty.websocket:websocket-core-client, \
+org.eclipse.jetty.websocket:websocket-core-common, \
+org.eclipse.jetty.websocket:websocket-core-server, \
+org.eclipse.jetty.websocket:websocket-jetty-api, \
+org.eclipse.jetty.websocket:websocket-jetty-client, \
+org.eclipse.jetty.websocket:websocket-jetty-common, \
+org.eclipse.jetty.websocket:websocket-jetty-server,\
+org.eclipse.jetty.websocket:websocket-javax-client, \
+org.eclipse.jetty.websocket:websocket-javax-common, \
+org.eclipse.jetty.websocket:websocket-javax-server,\
+org.eclipse.jetty.websocket:websocket-servlet, \
+
+Export-Package: org.eclipse.jetty.*
+
+Import-Package: \
+!java.*, \
+org.eclipse.jetty.webapp;resolution:="optional", \
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd
new file mode 100644
index 0000000..4ed3c60
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
+Argeo-Origin-M2: :10.0.14
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.client.bnd
new file mode 100644
index 0000000..bbe59b7
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.client.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-alpn-client
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.server.bnd
new file mode 100644
index 0000000..cd72af5
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.alpn.server.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-alpn-server
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.client.bnd
new file mode 100644
index 0000000..c6fd028
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.client.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-client
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.continuation.bnd.retired b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.continuation.bnd.retired
new file mode 100644
index 0000000..5cf169d
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.continuation.bnd.retired
@@ -0,0 +1,3 @@
+SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
+SLC-Origin-ManifestNotModified: true
+Bundle-SymbolicName: org.eclipse.jetty.continuation
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http.bnd
new file mode 100644
index 0000000..e6338bc
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-http
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd
new file mode 100644
index 0000000..89b7b2c
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.client.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:http2-client
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd
new file mode 100644
index 0000000..f106b39
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.common.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:http2-common
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd
new file mode 100644
index 0000000..75298f0
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.hpack.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:http2-hpack
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd
new file mode 100644
index 0000000..c62e1ed
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.http2.server.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty.http2:http2-server
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.io.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.io.bnd
new file mode 100644
index 0000000..40c1839
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.io.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-io
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.jmx.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.jmx.bnd
new file mode 100644
index 0000000..dc2803c
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.jmx.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-jmx
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.security.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.security.bnd
new file mode 100644
index 0000000..a691b62
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.security.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-security
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.server.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.server.bnd
new file mode 100644
index 0000000..d3e83cc
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.server.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-server
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd
new file mode 100644
index 0000000..4bcefbc
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlet.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-servlet
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd
new file mode 100644
index 0000000..daafe91
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.servlets.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-servlets
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.ajax.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.ajax.bnd
new file mode 100644
index 0000000..3f8dc5d
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.ajax.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-util-ajax
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.bnd
new file mode 100644
index 0000000..d594d02
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.util.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-util
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.xml.bnd b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.xml.bnd
new file mode 100644
index 0000000..3a8a0b7
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/jetty/org.eclipse.jetty.xml.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: org.eclipse.jetty:jetty-xml
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
deleted file mode 100644
index 7bed46c..0000000
--- a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd
+++ /dev/null
@@ -1,22 +0,0 @@
-Bundle-SymbolicName: org.eclipse.jetty.websocket
-SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
-Argeo-Origin-M2: :10.0.14
-Argeo-Origin-M2-Merge: \
-org.eclipse.jetty.websocket:websocket-core-client, \
-org.eclipse.jetty.websocket:websocket-core-common, \
-org.eclipse.jetty.websocket:websocket-core-server, \
-org.eclipse.jetty.websocket:websocket-jetty-api, \
-org.eclipse.jetty.websocket:websocket-jetty-client, \
-org.eclipse.jetty.websocket:websocket-jetty-common, \
-org.eclipse.jetty.websocket:websocket-jetty-server,\
-org.eclipse.jetty.websocket:websocket-javax-client, \
-org.eclipse.jetty.websocket:websocket-javax-common, \
-org.eclipse.jetty.websocket:websocket-javax-server,\
-org.eclipse.jetty.websocket:websocket-servlet, \
-
-Export-Package: org.eclipse.jetty.*
-
-Import-Package: \
-!java.*, \
-org.eclipse.jetty.webapp;resolution:="optional", \
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.jetty/jetty/common.bnd b/repackage/org.argeo.tp.jetty/jetty/common.bnd
deleted file mode 100644
index 4ed3c60..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
-Argeo-Origin-M2: :10.0.14
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.client.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.client.bnd
deleted file mode 100644
index bbe59b7..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.client.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-alpn-client
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.server.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.server.bnd
deleted file mode 100644
index cd72af5..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.alpn.server.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-alpn-server
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd
deleted file mode 100644
index c6fd028..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.client.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-client
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired
deleted file mode 100644
index 5cf169d..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.continuation.bnd.retired
+++ /dev/null
@@ -1,3 +0,0 @@
-SLC-Origin-M2: org.eclipse.jetty:jetty-continuation
-SLC-Origin-ManifestNotModified: true
-Bundle-SymbolicName: org.eclipse.jetty.continuation
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http.bnd
deleted file mode 100644
index e6338bc..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-http
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.client.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.client.bnd
deleted file mode 100644
index 89b7b2c..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.client.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty.http2:http2-client
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.common.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.common.bnd
deleted file mode 100644
index f106b39..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty.http2:http2-common
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.hpack.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.hpack.bnd
deleted file mode 100644
index 75298f0..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.hpack.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty.http2:http2-hpack
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.server.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.server.bnd
deleted file mode 100644
index c62e1ed..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.http2.server.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty.http2:http2-server
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.io.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.io.bnd
deleted file mode 100644
index 40c1839..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.io.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-io
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.jmx.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.jmx.bnd
deleted file mode 100644
index dc2803c..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.jmx.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-jmx
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.security.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.security.bnd
deleted file mode 100644
index a691b62..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.security.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-security
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.server.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.server.bnd
deleted file mode 100644
index d3e83cc..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.server.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-server
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlet.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlet.bnd
deleted file mode 100644
index 4bcefbc..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlet.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-servlet
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlets.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlets.bnd
deleted file mode 100644
index daafe91..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.servlets.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-servlets
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd
deleted file mode 100644
index 3f8dc5d..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.ajax.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-util-ajax
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.bnd
deleted file mode 100644
index d594d02..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.util.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-util
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.xml.bnd b/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.xml.bnd
deleted file mode 100644
index 3a8a0b7..0000000
--- a/repackage/org.argeo.tp.jetty/jetty/org.eclipse.jetty.xml.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: org.eclipse.jetty:jetty-xml
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.math/ejml/merge.bnd b/repackage/org.argeo.tp.math/ejml/merge.bnd
new file mode 100644
index 0000000..d027b3d
--- /dev/null
+++ b/repackage/org.argeo.tp.math/ejml/merge.bnd
@@ -0,0 +1,17 @@
+Bundle-SymbolicName: org.ejml
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :0.42
+Export-Package: org.ejml.*
+Argeo-Origin-M2-Merge: \
+org.ejml:ejml-core, \
+org.ejml:ejml-simple, \
+org.ejml:ejml-fdense, \
+org.ejml:ejml-ddense, \
+org.ejml:ejml-cdense, \
+org.ejml:ejml-zdense, \
+org.ejml:ejml-dsparse, \
+
+Import-Package: \
+us.hebi.matlab.*;resolution:="optional", \
+javax.swing;resolution:="optional",
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.math/org.apache.commons.math3.bnd b/repackage/org.argeo.tp.math/org.apache.commons.math3.bnd
new file mode 100644
index 0000000..e9ac478
--- /dev/null
+++ b/repackage/org.argeo.tp.math/org.apache.commons.math3.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-math3:3.6.1
diff --git a/repackage/org.argeo.tp.math/org.locationtech.jts.bnd b/repackage/org.argeo.tp.math/org.locationtech.jts.bnd
new file mode 100644
index 0000000..b163e3a
--- /dev/null
+++ b/repackage/org.argeo.tp.math/org.locationtech.jts.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.math/units/merge.bnd b/repackage/org.argeo.tp.math/units/merge.bnd
new file mode 100644
index 0000000..efdf074
--- /dev/null
+++ b/repackage/org.argeo.tp.math/units/merge.bnd
@@ -0,0 +1,14 @@
+SPDX-License-Identifier: BSD-3-Clause
+Bundle-SymbolicName: tech.units.indriya
+Argeo-Origin-M2: :2.0.4
+Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
+Import-Package: \
+*;resolution:="optional"
+Argeo-Origin-M2-Merge: \
+javax.measure:unit-api:2.0, \
+tech.units:indriya, \
+tech.uom.lib:uom-lib-common:2.0.1, \
+si.uom:si-units:2.0.1, \
+si.uom:si-quantity:2.0.1, \
+systems.uom:systems-common:2.0.2, \
+systems.uom:systems-quantity:2.0.2, \
diff --git a/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd
new file mode 100644
index 0000000..720e04c
--- /dev/null
+++ b/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.5
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.office/log4j/common.bnd b/repackage/org.argeo.tp.office/log4j/common.bnd
new file mode 100644
index 0000000..6cd7b19
--- /dev/null
+++ b/repackage/org.argeo.tp.office/log4j/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.20.0
diff --git a/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.api.bnd b/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.api.bnd
new file mode 100644
index 0000000..a999360
--- /dev/null
+++ b/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.api.bnd
@@ -0,0 +1,3 @@
+Argeo-Origin-M2: org.apache.logging.log4j:log4j-api
+Bundle-ActivationPolicy: lazy
+Import-Package: *;resolution:=optional
diff --git a/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.core.bnd
new file mode 100644
index 0000000..cd0ad25
--- /dev/null
+++ b/repackage/org.argeo.tp.office/log4j/org.apache.logging.log4j.core.bnd
@@ -0,0 +1,3 @@
+Argeo-Origin-M2: org.apache.logging.log4j:log4j-core
+Import-Package:\
+*;resolution:="optional"
diff --git a/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd
new file mode 100644
index 0000000..569d40a
--- /dev/null
+++ b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: Apache-2.0
+DynamicImport-Package: *
+Import-Package: org.apache.tools.ant.*;resolution:=optional,
+net.sf.saxon.*;resolution:=optional,
+com.sun.*;resolution:=optional,
+*
+Argeo-Origin-M2: org.apache.xmlbeans:xmlbeans:5.1.1
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.office/poi/common.bnd b/repackage/org.argeo.tp.office/poi/common.bnd
new file mode 100644
index 0000000..66536ad
--- /dev/null
+++ b/repackage/org.argeo.tp.office/poi/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :5.2.3
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.bnd
new file mode 100644
index 0000000..e6ee512
--- /dev/null
+++ b/repackage/org.argeo.tp.office/poi/org.apache.poi.bnd
@@ -0,0 +1,4 @@
+Argeo-Origin-M2: org.apache.poi:poi
+Import-Package: \
+org.apache.logging.log4j.*;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd
new file mode 100644
index 0000000..2a8bcf6
--- /dev/null
+++ b/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.bnd
@@ -0,0 +1,7 @@
+Import-Package: \
+com.graphbuilder.*;resolution:=optional,\
+com.graphbuilder.*;resolution:=optional,\
+org.etsi.uri.*;resolution:=optional,\
+org.apache.logging.log4j.*;resolution:=optional,\
+*
+Argeo-Origin-M2: org.apache.poi:poi-ooxml
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.schemas.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.schemas.bnd
new file mode 100644
index 0000000..385a652
--- /dev/null
+++ b/repackage/org.argeo.tp.office/poi/org.apache.poi.ooxml.schemas.bnd
@@ -0,0 +1,6 @@
+Import-Package: \
+com.microsoft.schemas.*;resolution:=optional, \
+org.openxmlformats.schemas.*;resolution:=optional, \
+*
+Require-Bundle: org.apache.xmlbeans
+Argeo-Origin-M2: org.apache.poi:poi-ooxml-full
diff --git a/repackage/org.argeo.tp.office/poi/org.apache.poi.scratchpad.bnd b/repackage/org.argeo.tp.office/poi/org.apache.poi.scratchpad.bnd
new file mode 100644
index 0000000..70e12e3
--- /dev/null
+++ b/repackage/org.argeo.tp.office/poi/org.apache.poi.scratchpad.bnd
@@ -0,0 +1,4 @@
+Argeo-Origin-M2: org.apache.poi:poi-scratchpad
+Import-Package: \
+org.apache.logging.log4j.*;resolution:=optional,\
+*
diff --git a/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd
deleted file mode 100644
index 720e04c..0000000
--- a/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.5
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.poi/log4j/common.bnd b/repackage/org.argeo.tp.poi/log4j/common.bnd
deleted file mode 100644
index 6cd7b19..0000000
--- a/repackage/org.argeo.tp.poi/log4j/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.20.0
diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd
deleted file mode 100644
index a999360..0000000
--- a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.api.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Argeo-Origin-M2: org.apache.logging.log4j:log4j-api
-Bundle-ActivationPolicy: lazy
-Import-Package: *;resolution:=optional
diff --git a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd b/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd
deleted file mode 100644
index cd0ad25..0000000
--- a/repackage/org.argeo.tp.poi/log4j/org.apache.logging.log4j.core.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-Argeo-Origin-M2: org.apache.logging.log4j:log4j-core
-Import-Package:\
-*;resolution:="optional"
diff --git a/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd
deleted file mode 100644
index 569d40a..0000000
--- a/repackage/org.argeo.tp.poi/org.apache.xmlbeans.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-DynamicImport-Package: *
-Import-Package: org.apache.tools.ant.*;resolution:=optional,
-net.sf.saxon.*;resolution:=optional,
-com.sun.*;resolution:=optional,
-*
-Argeo-Origin-M2: org.apache.xmlbeans:xmlbeans:5.1.1
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.poi/poi/common.bnd b/repackage/org.argeo.tp.poi/poi/common.bnd
deleted file mode 100644
index 66536ad..0000000
--- a/repackage/org.argeo.tp.poi/poi/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :5.2.3
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.bnd
deleted file mode 100644
index e6ee512..0000000
--- a/repackage/org.argeo.tp.poi/poi/org.apache.poi.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Argeo-Origin-M2: org.apache.poi:poi
-Import-Package: \
-org.apache.logging.log4j.*;resolution:=optional,\
-*
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.bnd
deleted file mode 100644
index 2a8bcf6..0000000
--- a/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-Import-Package: \
-com.graphbuilder.*;resolution:=optional,\
-com.graphbuilder.*;resolution:=optional,\
-org.etsi.uri.*;resolution:=optional,\
-org.apache.logging.log4j.*;resolution:=optional,\
-*
-Argeo-Origin-M2: org.apache.poi:poi-ooxml
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.schemas.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.schemas.bnd
deleted file mode 100644
index 385a652..0000000
--- a/repackage/org.argeo.tp.poi/poi/org.apache.poi.ooxml.schemas.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Import-Package: \
-com.microsoft.schemas.*;resolution:=optional, \
-org.openxmlformats.schemas.*;resolution:=optional, \
-*
-Require-Bundle: org.apache.xmlbeans
-Argeo-Origin-M2: org.apache.poi:poi-ooxml-full
diff --git a/repackage/org.argeo.tp.poi/poi/org.apache.poi.scratchpad.bnd b/repackage/org.argeo.tp.poi/poi/org.apache.poi.scratchpad.bnd
deleted file mode 100644
index 70e12e3..0000000
--- a/repackage/org.argeo.tp.poi/poi/org.apache.poi.scratchpad.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-Argeo-Origin-M2: org.apache.poi:poi-scratchpad
-Import-Package: \
-org.apache.logging.log4j.*;resolution:=optional,\
-*
diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
new file mode 100644
index 0000000..0b75aa3
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.42
diff --git a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd
new file mode 100644
index 0000000..c532bd7
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-3.0-only
+Argeo-Origin-M2: :9.1.22
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd
new file mode 100644
index 0000000..d4a0510
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.core.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-core
diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd
new file mode 100644
index 0000000..ace9050
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.openpdf.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf
diff --git a/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
new file mode 100644
index 0000000..6b89d64
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
@@ -0,0 +1,4 @@
+SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt
+Import-Package:\
+org.eclipse.swt.printing;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/fop/merge.bnd b/repackage/org.argeo.tp.publish/fop/merge.bnd
new file mode 100644
index 0000000..e0ca825
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/fop/merge.bnd
@@ -0,0 +1,16 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.fop
+Argeo-Origin-M2: :2.8
+Argeo-Origin-M2-Merge: \
+org.apache.xmlgraphics:fop-core,\
+org.apache.xmlgraphics:fop-util,\
+org.apache.xmlgraphics:fop-events,\
+org.apache.xmlgraphics:fop-pdf-images,\
+
+Export-Package: org.apache.fop.*
+
+Import-Package: \
+javax.media.jai;resolution:="optional",\
+com.thoughtworks.qdox.*;resolution:="optional",\
+org.apache.tools.ant.*;resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.publish/org.apache.pdfbox.jempbox.bnd b/repackage/org.argeo.tp.publish/org.apache.pdfbox.jempbox.bnd
new file mode 100644
index 0000000..34e5c0f
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/org.apache.pdfbox.jempbox.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.pdfbox:jempbox:1.8.17
diff --git a/repackage/org.argeo.tp.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd
new file mode 100644
index 0000000..2c9d220
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/pdfbox/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.0.27
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.fontbox.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.fontbox.bnd
new file mode 100644
index 0000000..8f6e26b
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/pdfbox/org.apache.fontbox.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:fontbox
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.bnd
new file mode 100644
index 0000000..98dd4d6
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.bnd
@@ -0,0 +1,5 @@
+Argeo-Origin-M2: org.apache.pdfbox:pdfbox
+Import-Package: \
+sun.java2d.cmm.kcms;resolution:="optional",\
+org.bouncycastle.*;resolution:="optional",\
+*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.xmpbox.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.xmpbox.bnd
new file mode 100644
index 0000000..a447a24
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/pdfbox/org.apache.xmpbox.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:xmpbox
diff --git a/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd
deleted file mode 100644
index 0b75aa3..0000000
--- a/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.42
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/common.bnd b/repackage/org.argeo.tp.utils/flying-saucer/common.bnd
deleted file mode 100644
index c532bd7..0000000
--- a/repackage/org.argeo.tp.utils/flying-saucer/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: LGPL-3.0-only
-Argeo-Origin-M2: :9.1.22
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd
deleted file mode 100644
index d4a0510..0000000
--- a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.core.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-core
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd
deleted file mode 100644
index ace9050..0000000
--- a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.openpdf.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.xhtmlrenderer:flying-saucer-pdf-openpdf
diff --git a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled b/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
deleted file mode 100644
index 6b89d64..0000000
--- a/repackage/org.argeo.tp.utils/flying-saucer/org.xhtmlrenderer.swt.bnd.disabled
+++ /dev/null
@@ -1,4 +0,0 @@
-SLC-Origin-M2: org.xhtmlrenderer:flying-saucer-swt
-Import-Package:\
-org.eclipse.swt.printing;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/fop/merge.bnd b/repackage/org.argeo.tp.utils/fop/merge.bnd
deleted file mode 100644
index e0ca825..0000000
--- a/repackage/org.argeo.tp.utils/fop/merge.bnd
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Bundle-SymbolicName: org.apache.fop
-Argeo-Origin-M2: :2.8
-Argeo-Origin-M2-Merge: \
-org.apache.xmlgraphics:fop-core,\
-org.apache.xmlgraphics:fop-util,\
-org.apache.xmlgraphics:fop-events,\
-org.apache.xmlgraphics:fop-pdf-images,\
-
-Export-Package: org.apache.fop.*
-
-Import-Package: \
-javax.media.jai;resolution:="optional",\
-com.thoughtworks.qdox.*;resolution:="optional",\
-org.apache.tools.ant.*;resolution:="optional",\
-*
diff --git a/repackage/org.argeo.tp.utils/javax.servlet.jsp.bnd b/repackage/org.argeo.tp.utils/javax.servlet.jsp.bnd
new file mode 100644
index 0000000..884367b
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/javax.servlet.jsp.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1
+Argeo-Origin-M2: javax.servlet.jsp:javax.servlet.jsp-api:2.3.3
+Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd
deleted file mode 100644
index e9ac478..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.math3.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-math3:3.6.1
diff --git a/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd b/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd
deleted file mode 100644
index 34e5c0f..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.pdfbox.jempbox.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.pdfbox:jempbox:1.8.17
diff --git a/repackage/org.argeo.tp.utils/pdfbox/common.bnd b/repackage/org.argeo.tp.utils/pdfbox/common.bnd
deleted file mode 100644
index 2c9d220..0000000
--- a/repackage/org.argeo.tp.utils/pdfbox/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.0.27
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.fontbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.fontbox.bnd
deleted file mode 100644
index 8f6e26b..0000000
--- a/repackage/org.argeo.tp.utils/pdfbox/org.apache.fontbox.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.pdfbox:fontbox
diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd
deleted file mode 100644
index 98dd4d6..0000000
--- a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Argeo-Origin-M2: org.apache.pdfbox:pdfbox
-Import-Package: \
-sun.java2d.cmm.kcms;resolution:="optional",\
-org.bouncycastle.*;resolution:="optional",\
-*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.xmpbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.xmpbox.bnd
deleted file mode 100644
index a447a24..0000000
--- a/repackage/org.argeo.tp.utils/pdfbox/org.apache.xmpbox.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.pdfbox:xmpbox
diff --git a/repackage/org.argeo.tp/javax.servlet.jsp.bnd b/repackage/org.argeo.tp/javax.servlet.jsp.bnd
deleted file mode 100644
index 884367b..0000000
--- a/repackage/org.argeo.tp/javax.servlet.jsp.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1
-Argeo-Origin-M2: javax.servlet.jsp:javax.servlet.jsp-api:2.3.3
-Argeo-Origin-NoMetadataGeneration: true