Refactor Argeo Third Parties categories

diff --git a/rebuild/org.argeo.tp.utils/Makefile b/rebuild/org.argeo.tp.utils/Makefile
index 95dcab8edaec59603d6830edac67cbb89cac4e21..5a1fa46e815a27301ba8f5d21152b9d502f25f53 100644 (file)
--- a/rebuild/org.argeo.tp.utils/Makefile
+++ b/rebuild/org.argeo.tp.utils/Makefile
@@ -27,10 +27,10 @@ retrieve-ee4j-mbox:
        # jni
        rsync -a $(SRC_DIR)/mbox/src/main/cpp/com/sun/mail/mbox/ $(MBOX_JNI_SRC)
        mkdir -p com.sun.mail.mbox/bin
-       javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.utils/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java
+       javac -h jni/com_sun_mail_mbox/ -cp "$(A2_OUTPUT)/org.argeo.tp.sys/*" com.sun.mail.mbox/src/com/sun/mail/mbox/*.java
        rm -rf com.sun.mail.mbox/bin
 
-A2_CATEGORY = org.argeo.tp.utils
+A2_CATEGORY = org.argeo.tp.sys
 
 BUNDLES = \
 com.sun.mail.mbox \
@@ -38,7 +38,7 @@ com.sun.mail.mbox \
 clean:
        rm -rf $(BUILD_BASE)
 
-DEP_CATEGORIES = org.argeo.tp.utils
+DEP_CATEGORIES = org.argeo.tp.sys
 
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
 

diff --git a/repackage/Makefile b/repackage/Makefile
index c509174f669e72afdbd19cbfe5d652e7f27df6dc..d48c6a4c3f6cefb1d7b8ff71ec73c77c36e7f9c8 100644 (file)
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -11,15 +11,16 @@ osgi/equinox/org.argeo.tp.eclipse \
 
 CATEGORIES=\
 $(CATEGORIES_CMS) \
+org.argeo.tp.sys \
 org.argeo.tp.sdk \
 osgi/api/org.argeo.tp.osgi \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
-lib/linux/x86_64/org.argeo.tp \
-lib/linux/aarch64/org.argeo.tp \
-lib/win32/x86_64/org.argeo.tp \
-lib/macosx/x86_64/org.argeo.tp \
+lib/linux/x86_64/org.argeo.tp.sys \
+lib/linux/aarch64/org.argeo.tp.sys \
+lib/win32/x86_64/org.argeo.tp.sys \
+lib/macosx/x86_64/org.argeo.tp.sys \
 lib/linux/x86_64/swt/rcp/org.argeo.tp.swt \
 lib/linux/aarch64/swt/rcp/org.argeo.tp.swt \
 lib/win32/x86_64/swt/rcp/org.argeo.tp.swt \
@@ -28,6 +29,7 @@ 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.utils \
+org.argeo.tp.img \
 org.argeo.tp.publish \
 org.argeo.tp.math \
 org.argeo.tp.jcr \

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/com.sun.jna.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:5.13.0
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd
deleted file mode 100644 (file)
index f5c1507..0000000
--- a/repackage/lib/linux/aarch64/org.argeo.tp/com.sun.jna.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
-Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/com.sun.jna.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:5.13.0
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd
deleted file mode 100644 (file)
index f5c1507..0000000
--- a/repackage/lib/linux/x86_64/org.argeo.tp/com.sun.jna.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
-Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/com.sun.jna.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:5.13.0
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd
deleted file mode 100644 (file)
index f5c1507..0000000
--- a/repackage/lib/macosx/x86_64/org.argeo.tp/com.sun.jna.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
-Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.bnd
new file mode 100644 (file)
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/com.sun.jna.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:5.13.0
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd b/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd
deleted file mode 100644 (file)
index f5c1507..0000000
--- a/repackage/lib/win32/x86_64/org.argeo.tp/com.sun.jna.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
-Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index 0904371f40311fa0f4dbd7ced8daef106a910434..3ad41412800c5ba1ae31f82d75744474078ce8a0 100644 (file)
--- a/repackage/org.argeo.tp.earth/geotools/merge.bnd
+++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd
@@ -49,6 +49,7 @@ 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: \

diff --git a/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd b/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd
new file mode 100644 (file)
index 0000000..3faceb5
--- /dev/null
+++ b/repackage/org.argeo.tp.earth/org.eclipse.xsd.bnd
@@ -0,0 +1,4 @@
+SPDX-License-Identifier: EPL-2.0
+# Required by GeoTools
+Argeo-Origin-M2: org.eclipse.emf:org.eclipse.xsd:2.19.0
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/javax.servlet.bnd b/repackage/org.argeo.tp.httpd/javax.servlet.bnd
new file mode 100644 (file)
index 0000000..4201c14
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/javax.servlet.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
+Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/javax.websocket.bnd b/repackage/org.argeo.tp.httpd/javax.websocket.bnd
new file mode 100644 (file)
index 0000000..66904f6
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/javax.websocket.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.websocket:javax.websocket-api:1.1
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd
new file mode 100644 (file)
index 0000000..9a0f1aa
--- /dev/null
+++ b/repackage/org.argeo.tp.httpd/org.apache.commons.fileupload.bnd
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: Apache-2.0
+Import-Package:\
+javax.portlet;resolution:=optional,\
+javax.servlet.*;resolution:=optional,\
+*
+Argeo-Origin-M2: commons-fileupload:commons-fileupload:1.5

diff --git a/repackage/org.argeo.tp.img/batik/common.bnd b/repackage/org.argeo.tp.img/batik/common.bnd
new file mode 100644 (file)
index 0000000..9e6d355
--- /dev/null
+++ b/repackage/org.argeo.tp.img/batik/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :1.17
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.img/batik/merge.bnd b/repackage/org.argeo.tp.img/batik/merge.bnd
new file mode 100644 (file)
index 0000000..aa1f6da
--- /dev/null
+++ b/repackage/org.argeo.tp.img/batik/merge.bnd
@@ -0,0 +1,27 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.batik
+Export-Package: org.apache.*
+Import-Package: \
+org.apache.batik.script.*;resolution:="optional",\
+org.apache.batik.*,\
+org.apache.xmlgraphics.*,\
+org.w3c.*,\
+*;resolution:="optional"
+Argeo-Origin-M2-Merge: \
+org.apache.xmlgraphics:batik-anim, \
+org.apache.xmlgraphics:batik-awt-util, \
+org.apache.xmlgraphics:batik-bridge, \
+org.apache.xmlgraphics:batik-codec, \
+org.apache.xmlgraphics:batik-dom, \
+org.apache.xmlgraphics:batik-ext, \
+org.apache.xmlgraphics:batik-extension, \
+org.apache.xmlgraphics:batik-gui-util, \
+org.apache.xmlgraphics:batik-gvt, \
+org.apache.xmlgraphics:batik-parser, \
+org.apache.xmlgraphics:batik-shared-resources, \
+org.apache.xmlgraphics:batik-script, \
+org.apache.xmlgraphics:batik-svg-dom, \
+org.apache.xmlgraphics:batik-svggen, \
+org.apache.xmlgraphics:batik-swing, \
+org.apache.xmlgraphics:batik-transcoder, \
+org.apache.xmlgraphics:batik-xml
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd
new file mode 100644 (file)
index 0000000..68d83e9
--- /dev/null
+++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.constants.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-constants

diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd
new file mode 100644 (file)
index 0000000..959eb09
--- /dev/null
+++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.css.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-css

diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd
new file mode 100644 (file)
index 0000000..2235e68
--- /dev/null
+++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.i18n.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-i18n

diff --git a/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd b/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd
new file mode 100644 (file)
index 0000000..216a588
--- /dev/null
+++ b/repackage/org.argeo.tp.img/batik/org.apache.batik.util.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.xmlgraphics:batik-util

diff --git a/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled b/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled
new file mode 100644 (file)
index 0000000..2c219c2
--- /dev/null
+++ b/repackage/org.argeo.tp.img/com.adobe.xmp.xmpcore.bnd.disabled
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: BSD-3-Clause
+# No source available in Maven Central for 6.1.11
+Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.11

diff --git a/repackage/org.argeo.tp.img/com.drew.metadata.bnd b/repackage/org.argeo.tp.img/com.drew.metadata.bnd
new file mode 100644 (file)
index 0000000..94689c5
--- /dev/null
+++ b/repackage/org.argeo.tp.img/com.drew.metadata.bnd
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0
+Import-Package: \
+com.adobe.*;resolution:=optional, \
+*

diff --git a/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd
new file mode 100644 (file)
index 0000000..a45cbc9
--- /dev/null
+++ b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-Version: 0.99.3
+Argeo-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3

diff --git a/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd b/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd
new file mode 100644 (file)
index 0000000..68f9c4d
--- /dev/null
+++ b/repackage/org.argeo.tp.img/xmlgraphics/merge.bnd
@@ -0,0 +1,11 @@
+SPDX-License-Identifier: Apache-2.0
+Bundle-SymbolicName: org.apache.xmlgraphics
+Argeo-Origin-M2: :2.9
+Argeo-Origin-M2-Merge: \
+org.apache.xmlgraphics:xmlgraphics-commons
+Export-Package: org.apache.xmlgraphics.*
+Import-Package: \
+org.apache.fop.image.loader.batik;resolution:="optional", \
+org.apache.fop.render.pdf.pdfbox;resolution:="optional", \
+*
+

diff --git a/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
new file mode 100644 (file)
index 0000000..292f716
--- /dev/null
+++ b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
@@ -0,0 +1,5 @@
+org.apache.fop.image.loader.batik.ImageConverterSVG2G2D
+org.apache.fop.image.loader.batik.ImageConverterG2D2SVG
+org.apache.fop.image.loader.batik.ImageConverterWMF2G2D
+org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2AFP
+org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
new file mode 100644 (file)
index 0000000..27dc74a
--- /dev/null
+++ b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
@@ -0,0 +1,4 @@
+org.apache.fop.image.loader.batik.ImageLoaderFactorySVG
+org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF
+org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryPDF
+org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryImageRawData
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
new file mode 100644 (file)
index 0000000..82f7977
--- /dev/null
+++ b/repackage/org.argeo.tp.img/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
@@ -0,0 +1,5 @@
+org.apache.fop.image.loader.batik.PreloaderWMF
+org.apache.fop.image.loader.batik.PreloaderSVG
+org.apache.fop.render.pdf.pdfbox.PreloaderPDF
+org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData
+org.apache.fop.render.pdf.pdfbox.LastResortPreloaderPDF
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd
new file mode 100644 (file)
index 0000000..421ace3
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/com.googlecode.javaewah.JavaEWAH.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.2.3
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
new file mode 100644 (file)
index 0000000..bf2e305
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/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/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd
new file mode 100644 (file)
index 0000000..7d28b18
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/de.thjom.java.systemd.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-2.0-only
+Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd
new file mode 100644 (file)
index 0000000..1db7eb0
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-annotations
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd
new file mode 100644 (file)
index 0000000..0457673
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.core.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-core
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd
new file mode 100644 (file)
index 0000000..5e42823
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.databind.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-databind
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/jackson/common.bnd b/repackage/org.argeo.tp.sys/jackson/common.bnd
new file mode 100644 (file)
index 0000000..faf3ecb
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jackson/common.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.15.2

diff --git a/repackage/org.argeo.tp.sys/javax.activation.bnd b/repackage/org.argeo.tp.sys/javax.activation.bnd
new file mode 100644 (file)
index 0000000..28c047c
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/javax.activation.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/javax.mail.bnd b/repackage/org.argeo.tp.sys/javax.mail.bnd
new file mode 100644 (file)
index 0000000..d20614b
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/javax.mail.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
+Argeo-Origin-M2: com.sun.mail:jakarta.mail:1.6.7
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd
new file mode 100644 (file)
index 0000000..f8a1d61
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: commons-codec:commons-codec:1.16.0

diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd
new file mode 100644 (file)
index 0000000..6236965
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-compress:1.24.0
+Import-Package: \
+org.brotli.*;resolution:=optional,
+org.tukaani.*;resolution:=optional,
+com.github.luben.zstd;resolution:=optional,
+*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd
new file mode 100644 (file)
index 0000000..0607a8b
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-exec:1.3

diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd
new file mode 100644 (file)
index 0000000..9900d35
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.vfs2.bnd
@@ -0,0 +1,4 @@
+SPDX-License-Identifier: Apache-2.0
+Import-Package: org.apache.tools.ant.*;resolution:=optional,
+*
+Argeo-Origin-M2: org.apache.commons:commons-vfs2:2.9.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd
new file mode 100644 (file)
index 0000000..27c4192
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpclient.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.httpcomponents:httpclient:4.5.14
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd
new file mode 100644 (file)
index 0000000..f40caa9
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpcore.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.httpcomponents:httpcore:4.4.16
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd
new file mode 100644 (file)
index 0000000..b25473d
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.httpcomponents.httpmime.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.httpcomponents:httpmime:4.5.14
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
new file mode 100644 (file)
index 0000000..d09967e
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: Apache-2.0
+# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11
+Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.78
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd
new file mode 100644 (file)
index 0000000..8f66ead
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r
+Import-Package: \
+sun.*;resolution:=optional, \
+com.jcraft.jsch;resolution:=optional, \
+*

diff --git a/repackage/org.argeo.tp.sys/org.jline.bnd b/repackage/org.argeo.tp.sys/org.jline.bnd
new file mode 100644 (file)
index 0000000..0f85fed
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.jline.bnd
@@ -0,0 +1,9 @@
+SPDX-License-Identifier: BSD-3-Clause
+Argeo-Origin-M2: org.jline:jline:3.23.0
+Import-Package:\
+sun.misc.*;resolution:="optional",\
+com.sun.jna.*;resolution:="optional",\
+org.fusesource.jansi.*;resolution:="optional",\
+org.apache.sshd.*;resolution:="optional",\
+javax.annotation.*;resolution:="optional",\
+*

diff --git a/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd
new file mode 100644 (file)
index 0000000..0dc40c0
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: LGPL-3.0-only OR GPL-3.0-only OR MPL-1.0
+Argeo-Origin-M2: com.github.albfernandez:juniversalchardet:2.4.0

diff --git a/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd
new file mode 100644 (file)
index 0000000..a58ae5b
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: CC0-1.0
+Argeo-Origin-M2: org.tukaani:xz:1.9

diff --git a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd
deleted file mode 100644 (file)
index 2c219c2..0000000
--- a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-# No source available in Maven Central for 6.1.11
-Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.11

diff --git a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd b/repackage/org.argeo.tp.utils/com.drew.metadata.bnd
deleted file mode 100644 (file)
index 86e37b3..0000000
--- a/repackage/org.argeo.tp.utils/com.drew.metadata.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.drewnoakes:metadata-extractor:2.18.0

diff --git a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd
deleted file mode 100644 (file)
index 421ace3..0000000
--- a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.2.3
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd b/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd
deleted file mode 100644 (file)
index 7d28b18..0000000
--- a/repackage/org.argeo.tp.utils/de.thjom.java.systemd.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: LGPL-2.0-only
-Argeo-Origin-M2: com.github.thjomnx:java-systemd:2.1.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/javax.activation.bnd b/repackage/org.argeo.tp.utils/javax.activation.bnd
deleted file mode 100644 (file)
index 28c047c..0000000
--- a/repackage/org.argeo.tp.utils/javax.activation.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: jakarta.activation:jakarta.activation-api:1.2.2
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.utils/javax.mail.bnd b/repackage/org.argeo.tp.utils/javax.mail.bnd
deleted file mode 100644 (file)
index d20614b..0000000
--- a/repackage/org.argeo.tp.utils/javax.mail.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: com.sun.mail:jakarta.mail:1.6.7
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd
deleted file mode 100644 (file)
index bb0c29d..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-csv:1.10.0

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled
new file mode 100644 (file)
index 0000000..bb0c29d
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd.disabled
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-csv:1.10.0

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd
deleted file mode 100644 (file)
index 0607a8b..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.exec.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-exec:1.3

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd
deleted file mode 100644 (file)
index a45cbc9..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.imaging.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Bundle-Version: 0.99.3
-Argeo-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd
deleted file mode 100644 (file)
index 173a150..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-text:1.10.0

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled
new file mode 100644 (file)
index 0000000..173a150
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.text.bnd.disabled
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.commons:commons-text:1.10.0

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd
deleted file mode 100644 (file)
index 9900d35..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Import-Package: org.apache.tools.ant.*;resolution:=optional,
-*
-Argeo-Origin-M2: org.apache.commons:commons-vfs2:2.9.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd
deleted file mode 100644 (file)
index 8f66ead..0000000
--- a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r
-Import-Package: \
-sun.*;resolution:=optional, \
-com.jcraft.jsch;resolution:=optional, \
-*

diff --git a/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd b/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd
deleted file mode 100644 (file)
index 3faceb5..0000000
--- a/repackage/org.argeo.tp.utils/org.eclipse.xsd.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-License-Identifier: EPL-2.0
-# Required by GeoTools
-Argeo-Origin-M2: org.eclipse.emf:org.eclipse.xsd:2.19.0
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd
deleted file mode 100644 (file)
index 6d62d87..0000000
--- a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: MPL-2.0
-Argeo-Origin-M2: org.mozilla:rhino:1.7.14
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled
new file mode 100644 (file)
index 0000000..6d62d87
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.mozilla.rhino.bnd.disabled
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: MPL-2.0
+Argeo-Origin-M2: org.mozilla:rhino:1.7.14
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd b/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd
new file mode 100644 (file)
index 0000000..f4cfa98
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.w3c.dom.smil.bnd
@@ -0,0 +1,7 @@
+SPDX-License-Identifier: W3C
+Bundle-Version: 1.0
+Argeo-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
+
+Import-Package: \
+org.w3c.*;resolution:="optional", \
+*

diff --git a/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd b/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd
new file mode 100644 (file)
index 0000000..89da058
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.w3c.dom.svg.bnd
@@ -0,0 +1,6 @@
+SPDX-License-Identifier: W3C
+Argeo-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1
+
+Import-Package: \
+org.w3c.*;resolution:="optional", \
+*

diff --git a/repackage/org.argeo.tp/batik/common.bnd b/repackage/org.argeo.tp/batik/common.bnd
deleted file mode 100644 (file)
index 9e6d355..0000000
--- a/repackage/org.argeo.tp/batik/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :1.17
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/batik/merge.bnd b/repackage/org.argeo.tp/batik/merge.bnd
deleted file mode 100644 (file)
index aa1f6da..0000000
--- a/repackage/org.argeo.tp/batik/merge.bnd
+++ /dev/null
@@ -1,27 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Bundle-SymbolicName: org.apache.batik
-Export-Package: org.apache.*
-Import-Package: \
-org.apache.batik.script.*;resolution:="optional",\
-org.apache.batik.*,\
-org.apache.xmlgraphics.*,\
-org.w3c.*,\
-*;resolution:="optional"
-Argeo-Origin-M2-Merge: \
-org.apache.xmlgraphics:batik-anim, \
-org.apache.xmlgraphics:batik-awt-util, \
-org.apache.xmlgraphics:batik-bridge, \
-org.apache.xmlgraphics:batik-codec, \
-org.apache.xmlgraphics:batik-dom, \
-org.apache.xmlgraphics:batik-ext, \
-org.apache.xmlgraphics:batik-extension, \
-org.apache.xmlgraphics:batik-gui-util, \
-org.apache.xmlgraphics:batik-gvt, \
-org.apache.xmlgraphics:batik-parser, \
-org.apache.xmlgraphics:batik-shared-resources, \
-org.apache.xmlgraphics:batik-script, \
-org.apache.xmlgraphics:batik-svg-dom, \
-org.apache.xmlgraphics:batik-svggen, \
-org.apache.xmlgraphics:batik-swing, \
-org.apache.xmlgraphics:batik-transcoder, \
-org.apache.xmlgraphics:batik-xml
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd
deleted file mode 100644 (file)
index 68d83e9..0000000
--- a/repackage/org.argeo.tp/batik/org.apache.batik.constants.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.xmlgraphics:batik-constants

diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd
deleted file mode 100644 (file)
index 959eb09..0000000
--- a/repackage/org.argeo.tp/batik/org.apache.batik.css.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.xmlgraphics:batik-css

diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd
deleted file mode 100644 (file)
index 2235e68..0000000
--- a/repackage/org.argeo.tp/batik/org.apache.batik.i18n.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.xmlgraphics:batik-i18n

diff --git a/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd b/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd
deleted file mode 100644 (file)
index 216a588..0000000
--- a/repackage/org.argeo.tp/batik/org.apache.batik.util.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.xmlgraphics:batik-util

diff --git a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd
deleted file mode 100644 (file)
index fc8f2e0..0000000
--- a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.apicatalog:titanium-json-ld:1.3.2

diff --git a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled
new file mode 100644 (file)
index 0000000..fc8f2e0
--- /dev/null
+++ b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd.disabled
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: com.apicatalog:titanium-json-ld:1.3.2

diff --git a/repackage/org.argeo.tp/com.sun.jna.platform.bnd b/repackage/org.argeo.tp/com.sun.jna.platform.bnd
deleted file mode 100644 (file)
index bf2e305..0000000
--- a/repackage/org.argeo.tp/com.sun.jna.platform.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-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/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd
deleted file mode 100644 (file)
index 1db7eb0..0000000
--- a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-annotations
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd
deleted file mode 100644 (file)
index 0457673..0000000
--- a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-core
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd
deleted file mode 100644 (file)
index 5e42823..0000000
--- a/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-databind
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd
deleted file mode 100644 (file)
index faf3ecb..0000000
--- a/repackage/org.argeo.tp/jackson/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.15.2

diff --git a/repackage/org.argeo.tp/javax.servlet.bnd b/repackage/org.argeo.tp/javax.servlet.bnd
deleted file mode 100644 (file)
index 4201c14..0000000
--- a/repackage/org.argeo.tp/javax.servlet.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp/javax.websocket.bnd b/repackage/org.argeo.tp/javax.websocket.bnd
deleted file mode 100644 (file)
index 66904f6..0000000
--- a/repackage/org.argeo.tp/javax.websocket.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.websocket:javax.websocket-api:1.1
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd
deleted file mode 100644 (file)
index f8a1d61..0000000
--- a/repackage/org.argeo.tp/org.apache.commons.codec.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-codec:commons-codec:1.16.0

diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd
deleted file mode 100644 (file)
index 6236965..0000000
--- a/repackage/org.argeo.tp/org.apache.commons.compress.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-compress:1.24.0
-Import-Package: \
-org.brotli.*;resolution:=optional,
-org.tukaani.*;resolution:=optional,
-com.github.luben.zstd;resolution:=optional,
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd
deleted file mode 100644 (file)
index 9a0f1aa..0000000
--- a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Import-Package:\
-javax.portlet;resolution:=optional,\
-javax.servlet.*;resolution:=optional,\
-*
-Argeo-Origin-M2: commons-fileupload:commons-fileupload:1.5

diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd
deleted file mode 100644 (file)
index 27c4192..0000000
--- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.httpcomponents:httpclient:4.5.14
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd
deleted file mode 100644 (file)
index f40caa9..0000000
--- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.httpcomponents:httpcore:4.4.16
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd
deleted file mode 100644 (file)
index b25473d..0000000
--- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.httpcomponents:httpmime:4.5.14
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
deleted file mode 100644 (file)
index d09967e..0000000
--- a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-# Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11
-Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.78
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.jline.bnd b/repackage/org.argeo.tp/org.jline.bnd
deleted file mode 100644 (file)
index 0f85fed..0000000
--- a/repackage/org.argeo.tp/org.jline.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.jline:jline:3.23.0
-Import-Package:\
-sun.misc.*;resolution:="optional",\
-com.sun.jna.*;resolution:="optional",\
-org.fusesource.jansi.*;resolution:="optional",\
-org.apache.sshd.*;resolution:="optional",\
-javax.annotation.*;resolution:="optional",\
-*

diff --git a/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd
deleted file mode 100644 (file)
index 0dc40c0..0000000
--- a/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: LGPL-3.0-only OR GPL-3.0-only OR MPL-1.0
-Argeo-Origin-M2: com.github.albfernandez:juniversalchardet:2.4.0

diff --git a/repackage/org.argeo.tp/org.tukaani.xz.bnd b/repackage/org.argeo.tp/org.tukaani.xz.bnd
deleted file mode 100644 (file)
index a58ae5b..0000000
--- a/repackage/org.argeo.tp/org.tukaani.xz.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: CC0-1.0
-Argeo-Origin-M2: org.tukaani:xz:1.9

diff --git a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd b/repackage/org.argeo.tp/org.w3c.dom.smil.bnd
deleted file mode 100644 (file)
index f4cfa98..0000000
--- a/repackage/org.argeo.tp/org.w3c.dom.smil.bnd
+++ /dev/null
@@ -1,7 +0,0 @@
-SPDX-License-Identifier: W3C
-Bundle-Version: 1.0
-Argeo-Origin-M2: org.axsl.org.w3c.dom.smil:smil-boston-dom-java:2000-02-25
-
-Import-Package: \
-org.w3c.*;resolution:="optional", \
-*

diff --git a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd b/repackage/org.argeo.tp/org.w3c.dom.svg.bnd
deleted file mode 100644 (file)
index 89da058..0000000
--- a/repackage/org.argeo.tp/org.w3c.dom.svg.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-SPDX-License-Identifier: W3C
-Argeo-Origin-M2: org.axsl.org.w3c.dom.svg:svg-dom-java:1.1
-
-Import-Package: \
-org.w3c.*;resolution:="optional", \
-*

diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp/xmlgraphics/merge.bnd
deleted file mode 100644 (file)
index 68f9c4d..0000000
--- a/repackage/org.argeo.tp/xmlgraphics/merge.bnd
+++ /dev/null
@@ -1,11 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Bundle-SymbolicName: org.apache.xmlgraphics
-Argeo-Origin-M2: :2.9
-Argeo-Origin-M2-Merge: \
-org.apache.xmlgraphics:xmlgraphics-commons
-Export-Package: org.apache.xmlgraphics.*
-Import-Package: \
-org.apache.fop.image.loader.batik;resolution:="optional", \
-org.apache.fop.render.pdf.pdfbox;resolution:="optional", \
-*
-

diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
deleted file mode 100644 (file)
index 292f716..0000000
--- a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
+++ /dev/null
@@ -1,5 +0,0 @@
-org.apache.fop.image.loader.batik.ImageConverterSVG2G2D
-org.apache.fop.image.loader.batik.ImageConverterG2D2SVG
-org.apache.fop.image.loader.batik.ImageConverterWMF2G2D
-org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2AFP
-org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
deleted file mode 100644 (file)
index 27dc74a..0000000
--- a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
+++ /dev/null
@@ -1,4 +0,0 @@
-org.apache.fop.image.loader.batik.ImageLoaderFactorySVG
-org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF
-org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryPDF
-org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryImageRawData
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
deleted file mode 100644 (file)
index 82f7977..0000000
--- a/repackage/org.argeo.tp/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
+++ /dev/null
@@ -1,5 +0,0 @@
-org.apache.fop.image.loader.batik.PreloaderWMF
-org.apache.fop.image.loader.batik.PreloaderSVG
-org.apache.fop.render.pdf.pdfbox.PreloaderPDF
-org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData
-org.apache.fop.render.pdf.pdfbox.LastResortPreloaderPDF
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-apps.target b/sdk/output-argeo-tp-apps.target
index ab4040aeeefaaa0e90208896147905cde97a75e4..4347af16de11e5d02201c2871ee7bac244c195eb 100644 (file)
--- a/sdk/output-argeo-tp-apps.target
+++ b/sdk/output-argeo-tp-apps.target
@@ -3,6 +3,7 @@
 <target name="argeo-tp-apps">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.utils" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.img" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.publish" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.math" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.earth" type="Directory"/>

diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
index 08e0cb7be4d1b610af2c43bf4232193de9a095e2..893afc08ba6f17c7b00540233f330a7c3dcd2b6e 100644 (file)
--- a/sdk/output-argeo-tp-platform.target
+++ b/sdk/output-argeo-tp-platform.target
@@ -5,12 +5,13 @@
                <location path="${project_loc:argeo-tp}/../output/a2/crypto/fips/org.argeo.tp.crypto" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/log/syslogger/org.argeo.tp" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.httpd" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.build" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sys" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
        </locations>
        <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-rcp-win.target b/sdk/output-argeo-tp-rcp-win.target
index 8696d8403e9db4b276454f21d3ba0a4ed59f6d89..c6920709b887878898815b48d317ce6393941454 100644 (file)
--- a/sdk/output-argeo-tp-rcp-win.target
+++ b/sdk/output-argeo-tp-rcp-win.target
@@ -3,6 +3,7 @@
 <target name="argeo-tp-rcp-win">\r
        <locations>\r
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>\r
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/win32/x86_64/org.argeo.tp.sys" type="Directory"/>\r
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt-win.target"/>\r
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>\r
        </locations>\r

diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
index bd35257b202c4a307818af7f2ce5f5660da46335..2f2d6acd11faf39c1b41d0210a78e779c2e82207 100644 (file)
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@ -3,6 +3,7 @@
 <target name="argeo-tp-rcp">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
+               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp.sys" type="Directory"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-apps.target"/>
        </locations>

diff --git a/sdk/output-argeo-tp-swt.target b/sdk/output-argeo-tp-swt.target
index 40bee2f41182a6dfddfb1d2187ba137a685dd205..76a1b32f252bd327bbe216bca909c5acd5a03f5c 100644 (file)
--- a/sdk/output-argeo-tp-swt.target
+++ b/sdk/output-argeo-tp-swt.target
@@ -3,7 +3,6 @@
 <target name="argeo-tp-swt">
        <locations>
                <location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
-               <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/org.argeo.tp" type="Directory"/>
                <location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
                <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-platform.target"/>
        </locations>