Rename various bundles, for consistency with upstream when possible

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
deleted file mode 100644 (file)
index 8d55c0c..0000000
--- a/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-ManifestNotModified: true
-Argeo-Origin-M2: org.bouncycastle:bcmail-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
deleted file mode 100644 (file)
index 552f072..0000000
--- a/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-ManifestNotModified: true
-Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
deleted file mode 100644 (file)
index 8ff2a19..0000000
--- a/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-ManifestNotModified: true
-Argeo-Origin-M2: org.bouncycastle:bcpkix-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
deleted file mode 100644 (file)
index 923a313..0000000
--- a/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-ManifestNotModified: true
-Argeo-Origin-M2: org.bouncycastle:bcprov-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
deleted file mode 100644 (file)
index b7314a0..0000000
--- a/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-Argeo-Origin-ManifestNotModified: true
-Argeo-Origin-M2: org.bouncycastle:bcutil-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.mail.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.mail.bnd
new file mode 100644 (file)
index 0000000..8d55c0c
--- /dev/null
+++ b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.mail.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.bouncycastle:bcmail-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd
new file mode 100644 (file)
index 0000000..552f072
--- /dev/null
+++ b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pkix.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pkix.bnd
new file mode 100644 (file)
index 0000000..8ff2a19
--- /dev/null
+++ b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pkix.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.bouncycastle:bcpkix-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.provider.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.provider.bnd
new file mode 100644 (file)
index 0000000..923a313
--- /dev/null
+++ b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.provider.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.bouncycastle:bcprov-jdk18on

diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.util.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.util.bnd
new file mode 100644 (file)
index 0000000..b7314a0
--- /dev/null
+++ b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.util.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-ManifestNotModified: true
+Argeo-Origin-M2: org.bouncycastle:bcutil-jdk18on

diff --git a/repackage/org.argeo.tp.sdk/org.apiguardian.api.bnd b/repackage/org.argeo.tp.sdk/org.apiguardian.api.bnd
new file mode 100644 (file)
index 0000000..2b1f78f
--- /dev/null
+++ b/repackage/org.argeo.tp.sdk/org.apiguardian.api.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apiguardian:apiguardian-api:1.1.2
\ No newline at end of file

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

diff --git a/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
new file mode 100644 (file)
index 0000000..9b82635
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/com.github.librepdf.openpdf.bnd
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: LGPL-2.1
+Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.30
+Import-Package: \
+com.ibm.icu.*;resolution:=optional,\
+*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/com.lowagie.bnd b/repackage/org.argeo.tp.utils/com.lowagie.bnd
deleted file mode 100644 (file)
index 9b82635..0000000
--- a/repackage/org.argeo.tp.utils/com.lowagie.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-SPDX-License-Identifier: LGPL-2.1
-Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.30
-Import-Package: \
-com.ibm.icu.*;resolution:=optional,\
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs.bnd
deleted file mode 100644 (file)
index 9900d35..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.commons.vfs.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.apache.commons.vfs2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.vfs2.bnd
new file mode 100644 (file)
index 0000000..9900d35
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/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.utils/org.apache.santuario.xmlsec.bnd b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd
new file mode 100644 (file)
index 0000000..a4dd759
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd
@@ -0,0 +1,2 @@
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.2

diff --git a/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd b/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd
deleted file mode 100644 (file)
index a4dd759..0000000
--- a/repackage/org.argeo.tp.utils/org.apache.xml.security.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.2

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

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

diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.fontbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.fontbox.bnd
new file mode 100644 (file)
index 0000000..8f6e26b
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/pdfbox/org.apache.fontbox.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:fontbox

diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.fontbox.bnd
deleted file mode 100644 (file)
index 8f6e26b..0000000
--- a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.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.xmpbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd
deleted file mode 100644 (file)
index a447a24..0000000
--- a/repackage/org.argeo.tp.utils/pdfbox/org.apache.pdfbox.xmpbox.bnd
+++ /dev/null
@@ -1 +0,0 @@
-Argeo-Origin-M2: org.apache.pdfbox:xmpbox

diff --git a/repackage/org.argeo.tp.utils/pdfbox/org.apache.xmpbox.bnd b/repackage/org.argeo.tp.utils/pdfbox/org.apache.xmpbox.bnd
new file mode 100644 (file)
index 0000000..a447a24
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/pdfbox/org.apache.xmpbox.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:xmpbox

diff --git a/repackage/org.argeo.tp/com.h2database.bnd b/repackage/org.argeo.tp/com.h2database.bnd
new file mode 100644 (file)
index 0000000..db8d34f
--- /dev/null
+++ b/repackage/org.argeo.tp/com.h2database.bnd
@@ -0,0 +1,9 @@
+SPDX-License-Identifier: MPL-2.0
+Argeo-Origin-M2: com.h2database:h2:2.1.214
+Import-Package:\
+jakarta.*;resolution:=optional,\
+org.apache.lucene.*;resolution:=optional,\
+org.codehaus.groovy.*;resolution:=optional,\
+org.osgi.*;resolution:=optional,\
+com.ibm.icu.*;resolution:=optional,\
+*
\ No newline at end of file

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 1e4f92e..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-ManifestNotModified: 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 2749148..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-ManifestNotModified: 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 47d85a9..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-ManifestNotModified: 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
new file mode 100644 (file)
index 0000000..1e4f92e
--- /dev/null
+++ b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.annotations.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-annotations
+Argeo-Origin-ManifestNotModified: 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
new file mode 100644 (file)
index 0000000..2749148
--- /dev/null
+++ b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.core.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-core
+Argeo-Origin-ManifestNotModified: 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
new file mode 100644 (file)
index 0000000..47d85a9
--- /dev/null
+++ b/repackage/org.argeo.tp/jackson/com.fasterxml.jackson.core.jackson.databind.bnd
@@ -0,0 +1,2 @@
+Argeo-Origin-M2: com.fasterxml.jackson.core:jackson-databind
+Argeo-Origin-ManifestNotModified: true

diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd
deleted file mode 100644 (file)
index db8d34f..0000000
--- a/repackage/org.argeo.tp/org.h2.bnd
+++ /dev/null
@@ -1,9 +0,0 @@
-SPDX-License-Identifier: MPL-2.0
-Argeo-Origin-M2: com.h2database:h2:2.1.214
-Import-Package:\
-jakarta.*;resolution:=optional,\
-org.apache.lucene.*;resolution:=optional,\
-org.codehaus.groovy.*;resolution:=optional,\
-org.osgi.*;resolution:=optional,\
-com.ibm.icu.*;resolution:=optional,\
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.postgresql.bnd b/repackage/org.argeo.tp/org.postgresql.bnd
deleted file mode 100644 (file)
index 5500e57..0000000
--- a/repackage/org.argeo.tp/org.postgresql.bnd
+++ /dev/null
@@ -1,8 +0,0 @@
-SPDX-License-Identifier: BSD-2-Clause
-Argeo-Origin-M2: org.postgresql:postgresql:42.5.4
-Import-Package:\
-org.osgi.service.jdbc;resolution:="optional",\
-com.sun.jna.*;resolution:="optional",\
-org.checkerframework.*;resolution:="optional",\
-waffle.*;resolution:="optional",\
-*
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.postgresql.jdbc.bnd b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd
new file mode 100644 (file)
index 0000000..5500e57
--- /dev/null
+++ b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd
@@ -0,0 +1,8 @@
+SPDX-License-Identifier: BSD-2-Clause
+Argeo-Origin-M2: org.postgresql:postgresql:42.5.4
+Import-Package:\
+org.osgi.service.jdbc;resolution:="optional",\
+com.sun.jna.*;resolution:="optional",\
+org.checkerframework.*;resolution:="optional",\
+waffle.*;resolution:="optional",\
+*
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index abfc87b5d18e7c5a8db62b5aa086d8d5710c6f79..fafc98ba3bed1f1f9683324ad9c11f0402c2d687 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit abfc87b5d18e7c5a8db62b5aa086d8d5710c6f79
+Subproject commit fafc98ba3bed1f1f9683324ad9c11f0402c2d687