From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 9 Nov 2023 10:35:47 +0000 (+0100)
Subject: Merge tag 'v2.3.15' into testing
X-Git-Tag: v2.1.34~3
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=0956ab175dc0862d21a0c2418351312715681842;hp=0b23b11f41ef46624b193113ddf518b20fd8cb9b;p=gpl%2Fargeo-tp.git

Merge tag 'v2.3.15' into testing
---

diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd
new file mode 100644
index 0000000..890773f
--- /dev/null
+++ b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.bouncycastle:bc-fips
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled
deleted file mode 100644
index b3384ca..0000000
--- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled
+++ /dev/null
@@ -1,3 +0,0 @@
-# !! The current version is unsafe, see:
-# https://github.com/bcgit/bc-java/wiki/CVE-2022-45146
-Argeo-Origin-M2: org.bouncycastle:bc-fips
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd
deleted file mode 100644
index 4788299..0000000
--- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-# !! The current version is unsafe, see:
-# https://github.com/bcgit/bc-java/wiki/CVE-2022-45146
-Argeo-Origin-M2: org.bouncycastle:bc-noncert:1.0.2.4
-Argeo-Origin-URI: https://downloads.bouncycastle.org/fips-java/bc-noncert-1.0.2.4.jar
-Argeo-Origin-Sources-URI: https://downloads.bouncycastle.org/fips-java/bc-noncert-1.0.2.4-sources.jar
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd.disabled b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd.disabled
new file mode 100644
index 0000000..4788299
--- /dev/null
+++ b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd.disabled
@@ -0,0 +1,5 @@
+# !! The current version is unsafe, see:
+# https://github.com/bcgit/bc-java/wiki/CVE-2022-45146
+Argeo-Origin-M2: org.bouncycastle:bc-noncert:1.0.2.4
+Argeo-Origin-URI: https://downloads.bouncycastle.org/fips-java/bc-noncert-1.0.2.4.jar
+Argeo-Origin-Sources-URI: https://downloads.bouncycastle.org/fips-java/bc-noncert-1.0.2.4-sources.jar
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd
index 7de0139..d1ad75a 100644
--- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd
+++ b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd
@@ -1 +1,2 @@
-Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.14.1
+# 1.0.17 in Maven seems to be broken (no OSGi metad data, not signed)
+Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.16
diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd
index 85574ab..108ed45 100644
--- a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd
+++ b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd
@@ -1,4 +1,4 @@
 SPDX-License-Identifier: MIT
-Argeo-Origin-M2: :1.73
+Argeo-Origin-M2: :1.76
 Argeo-Origin-NoMetadataGeneration: true
 Argeo-Origin-Do-Not-Modify: 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
new file mode 100644
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/linux/aarch64/org.argeo.tp/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/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
deleted file mode 100644
index 8c4c7a4..0000000
--- a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties
deleted file mode 100644
index c5cebf3..0000000
--- a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/includes.properties
+++ /dev/null
@@ -1 +0,0 @@
-plugins/com.sun.jna*.jar=
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
new file mode 100644
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/linux/x86_64/org.argeo.tp/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/eclipse-rcp/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
deleted file mode 100644
index 8c4c7a4..0000000
--- a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
deleted file mode 100644
index c5cebf3..0000000
--- a/repackage/lib/linux/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
+++ /dev/null
@@ -1 +0,0 @@
-plugins/com.sun.jna*.jar=
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
new file mode 100644
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp/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/eclipse-rcp/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
deleted file mode 100644
index 8c4c7a4..0000000
--- a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
deleted file mode 100644
index c5cebf3..0000000
--- a/repackage/lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
+++ /dev/null
@@ -1 +0,0 @@
-plugins/com.sun.jna*.jar=
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
new file mode 100644
index 0000000..f5c1507
--- /dev/null
+++ b/repackage/lib/win32/x86_64/org.argeo.tp/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/eclipse-rcp/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
deleted file mode 100644
index 8c4c7a4..0000000
--- a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties b/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
deleted file mode 100644
index c5cebf3..0000000
--- a/repackage/lib/win32/x86_64/org.argeo.tp/eclipse-rcp/includes.properties
+++ /dev/null
@@ -1 +0,0 @@
-plugins/com.sun.jna*.jar=
diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index 2a8d4a3..f02ff88 100644
--- a/repackage/org.argeo.tp.earth/geotools/merge.bnd
+++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: LGPL-2.1-only
 Bundle-SymbolicName: org.geotools
-Argeo-Origin-M2: :29.1
+Argeo-Origin-M2: :29.2
 Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
 
 Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.*
@@ -36,8 +36,19 @@ org.eclipse.*;resolution:="optional",\
 org.jaitools.*;resolution:="optional",\
 org.jdom2.*;resolution:="optional",\
 org.junit.*;resolution:="optional",\
-org.parboiled.*;resolution:="optional",\
 org.picocontainer.*;resolution:="optional",\
+org.parboiled.annotations;resolution:="optional",\
+org.parboiled.buffers;resolution:="optional",\
+org.parboiled.common;resolution:="optional",\
+org.parboiled.errors;resolution:="optional",\
+org.parboiled.matchers;resolution:="optional",\
+org.parboiled.matchervisitors;resolution:="optional",\
+org.parboiled.parserunners;resolution:="optional",\
+org.parboiled.support;resolution:="optional",\
+org.parboiled.test;resolution:="optional",\
+org.parboiled.transform;resolution:="optional",\
+org.parboiled.trees;resolution:="optional",\
+org.parboiled.*;resolution:="optional",\
 *
 
 Argeo-Origin-M2-Merge: \
@@ -89,3 +100,6 @@ org.geotools.ogc:net.opengis.wfs, \
 org.geotools.ogc:net.opengis.wmts, \
 org.geotools.ogc:net.opengis.fes, \
 org.geotools.ogc:org.w3.xlink, \
+org.picocontainer:picocontainer:1.2, \
+
+# Note: PicoContainer (v1.2) is needed for dependency injection by GeooTools XSD (GML, etc.)
diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index 7612c79..cd46982 100644
--- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
+++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName: org.eclipse.jetty.websocket
 SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
-Argeo-Origin-M2: :10.0.15
+Argeo-Origin-M2: :10.0.16
 Argeo-Origin-M2-Merge: \
 org.eclipse.jetty.websocket:websocket-core-client, \
 org.eclipse.jetty.websocket:websocket-core-common, \
diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd
index a4e02f0..a648fcb 100644
--- a/repackage/org.argeo.tp.httpd/jetty/common.bnd
+++ b/repackage/org.argeo.tp.httpd/jetty/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
-Argeo-Origin-M2: :10.0.15
+Argeo-Origin-M2: :10.0.16
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd
index 29be7dc..0a2abe6 100644
--- a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd
+++ b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.20.10
\ No newline at end of file
+Argeo-Origin-M2: :2.20.12
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.jcr/oak/common.bnd b/repackage/org.argeo.tp.jcr/oak/common.bnd
index e907d29..eadd95e 100644
--- a/repackage/org.argeo.tp.jcr/oak/common.bnd
+++ b/repackage/org.argeo.tp.jcr/oak/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :1.52.0
\ No newline at end of file
+Argeo-Origin-M2: :1.56.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.math/ejml/merge.bnd b/repackage/org.argeo.tp.math/ejml/merge.bnd
index e77efdd..8a1518d 100644
--- a/repackage/org.argeo.tp.math/ejml/merge.bnd
+++ b/repackage/org.argeo.tp.math/ejml/merge.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName: org.ejml
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :0.43
+Argeo-Origin-M2: :0.43.1
 Export-Package: org.ejml.*
 Argeo-Origin-M2-Merge: \
 org.ejml:ejml-core, \
diff --git a/repackage/org.argeo.tp.office/poi/common.bnd b/repackage/org.argeo.tp.office/poi/common.bnd
index 66536ad..e030d3e 100644
--- a/repackage/org.argeo.tp.office/poi/common.bnd
+++ b/repackage/org.argeo.tp.office/poi/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :5.2.3
\ No newline at end of file
+Argeo-Origin-M2: :5.2.4
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
index e159513..ea833ff 100644
--- a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
+++ b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.43
+Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:3.0.0
 
 Import-Package: \
 sun.*;resolution:=optional, \
diff --git a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd
index c532bd7..b1dce98 100644
--- a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd
+++ b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: LGPL-3.0-only
-Argeo-Origin-M2: :9.1.22
\ No newline at end of file
+Argeo-Origin-M2: :9.3.1
\ 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
index e0ca825..b0550e4 100644
--- a/repackage/org.argeo.tp.publish/fop/merge.bnd
+++ b/repackage/org.argeo.tp.publish/fop/merge.bnd
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: Apache-2.0
 Bundle-SymbolicName: org.apache.fop
-Argeo-Origin-M2: :2.8
+Argeo-Origin-M2: :2.9
 Argeo-Origin-M2-Merge: \
 org.apache.xmlgraphics:fop-core,\
 org.apache.xmlgraphics:fop-util,\
diff --git a/repackage/org.argeo.tp.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd
index 0a280f1..973e8a1 100644
--- a/repackage/org.argeo.tp.publish/pdfbox/common.bnd
+++ b/repackage/org.argeo.tp.publish/pdfbox/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.0.28
\ No newline at end of file
+Argeo-Origin-M2: :3.0.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.io.bnd b/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.io.bnd
new file mode 100644
index 0000000..d4cf21a
--- /dev/null
+++ b/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.io.bnd
@@ -0,0 +1 @@
+Argeo-Origin-M2: org.apache.pdfbox:pdfbox-io
diff --git a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd
index a57dd47..865c6ea 100644
--- a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd
+++ b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: EPL-2.0
 Bundle-SymbolicName: org.junit.jupiter
-Argeo-Origin-M2: :5.9.3
+Argeo-Origin-M2: :5.10.0
 Argeo-Origin-M2-Merge: \
 org.junit.jupiter:junit-jupiter-api, \
 org.junit.jupiter:junit-jupiter-engine, \
diff --git a/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd b/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd
index b8d5cb5..0ca0cc2 100644
--- a/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd
+++ b/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: EPL-2.0
 Bundle-SymbolicName: org.junit.platform
-Argeo-Origin-M2: :1.9.3
+Argeo-Origin-M2: :1.10.0
 Argeo-Origin-M2-Merge: \
 org.junit.platform:junit-platform-commons, \
 org.junit.platform:junit-platform-console, \
diff --git a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd
index 2b1ab94..52acae7 100644
--- a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd
+++ b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: EPL-2.0
-Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.9.3
\ No newline at end of file
+Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.10.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sdk/org.opentest4j.bnd b/repackage/org.argeo.tp.sdk/org.opentest4j.bnd
index 7622d97..3196a8a 100644
--- a/repackage/org.argeo.tp.sdk/org.opentest4j.bnd
+++ b/repackage/org.argeo.tp.sdk/org.opentest4j.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.opentest4j:opentest4j:1.2.0
\ No newline at end of file
+Argeo-Origin-M2: org.opentest4j:opentest4j:1.3.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd b/repackage/org.argeo.tp.utils/asm/common.bnd
index cc32d2b..bb59a0f 100644
--- a/repackage/org.argeo.tp.utils/asm/common.bnd
+++ b/repackage/org.argeo.tp.utils/asm/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: :9.4
+Argeo-Origin-M2: :9.6
diff --git a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd
index 66fc30a..2c219c2 100644
--- a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd
+++ b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd
@@ -1,3 +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.10
+Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.11
diff --git a/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd b/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd
index 09fbdcc..f7557de 100644
--- a/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd
+++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: BSD-2-Clause
-Argeo-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.12.0
+Argeo-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.12.1
 Import-Package: \
 freemarker.*;resolution:="optional", \
 com.fasterxml.jackson.*;resolution:="optional", \
diff --git a/repackage/org.argeo.tp.utils/com.graphbuilder.bnd b/repackage/org.argeo.tp.utils/com.graphbuilder.bnd
index 6850718..6aa27d1 100644
--- a/repackage/org.argeo.tp.utils/com.graphbuilder.bnd
+++ b/repackage/org.argeo.tp.utils/com.graphbuilder.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: com.github.virtuald:curvesapi:1.07
+Argeo-Origin-M2: com.github.virtuald:curvesapi:1.08
diff --git a/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd b/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd
index 0f1f4be..20e1f0d 100644
--- a/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd
+++ b/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.zaxxer:SparseBitSet:1.2
+Argeo-Origin-M2: com.zaxxer:SparseBitSet:1.3
diff --git a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd
index a22d535..2b64c2c 100644
--- a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd
+++ b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: MPL-2.0
-Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.2
+Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.3
 Import-Package:\
 com.sun.org.apache.xerces.internal.jaxp;resolution:="optional",\
 jline.*;resolution:="optional",\
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
index 1f6e450..0aea1a9 100644
--- a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.9.0
+Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.10.0
 
 Import-Package: javax.transaction.*; resolution:="optional",\
 *
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd
index e90caec..47b6b65 100644
--- a/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-lang3:3.12.0
+Argeo-Origin-M2: org.apache.commons:commons-lang3:3.13.0
diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
index 6826cea..5b4d389 100644
--- a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
+++ b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-pool2:2.11.1
+Argeo-Origin-M2: org.apache.commons:commons-pool2:2.12.0
diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd
index 5ad0391..8f66ead 100644
--- a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd
+++ b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r
+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
new file mode 100644
index 0000000..3faceb5
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/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.utils/org.xmlresolver.bnd b/repackage/org.argeo.tp.utils/org.xmlresolver.bnd
index 246043a..70cb2a2 100644
--- a/repackage/org.argeo.tp.utils/org.xmlresolver.bnd
+++ b/repackage/org.argeo.tp.utils/org.xmlresolver.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.0
+Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.2
 Import-Package:\
 com.thaiopensource.*;resolution:="optional",\
 org.apache.xerces.*;resolution:="optional",\
diff --git a/repackage/org.argeo.tp.utils/parboiled/merge.bnd b/repackage/org.argeo.tp.utils/parboiled/merge.bnd
new file mode 100644
index 0000000..e95f175
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/parboiled/merge.bnd
@@ -0,0 +1,10 @@
+Bundle-SymbolicName: org.parboiled
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :1.4.1
+
+Export-Package: *
+DynamicImport-Package: *
+
+Argeo-Origin-M2-Merge: \
+org.parboiled:parboiled-core,\
+org.parboiled:parboiled-java,\
diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd
index fd0587d..9c0021b 100644
--- a/repackage/org.argeo.tp.utils/tika/merge.bnd
+++ b/repackage/org.argeo.tp.utils/tika/merge.bnd
@@ -1,6 +1,6 @@
 Bundle-SymbolicName: org.apache.tika
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.8.0
+Argeo-Origin-M2: :2.9.0
 Export-Package: org.apache.*
 Import-Package: *;resolution:=optional
 Argeo-Origin-M2-Merge: \
diff --git a/repackage/org.argeo.tp.utils/xalan/merge.bnd b/repackage/org.argeo.tp.utils/xalan/merge.bnd
new file mode 100644
index 0000000..adb8fd0
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/xalan/merge.bnd
@@ -0,0 +1,15 @@
+Bundle-SymbolicName: org.apache.xalan
+SPDX-License-Identifier: Apache-2.0
+Argeo-Origin-M2: :2.7.2
+# v2.7.3 does not provides sources in Maven Central
+#Argeo-Origin-M2: :2.7.3
+Export-Package: org.apache.*
+Argeo-Origin-M2-Merge: \
+xalan:xalan,\
+xalan:serializer,\
+
+Import-Package: \
+javax.xml.*;resolution:="optional", \
+org.w3c.*;resolution:="optional", \
+org.xml.*;resolution:="optional", \
+*
diff --git a/repackage/org.argeo.tp/apache-sshd/merge.bnd b/repackage/org.argeo.tp/apache-sshd/merge.bnd
index b8ab9a6..d65c5cc 100644
--- a/repackage/org.argeo.tp/apache-sshd/merge.bnd
+++ b/repackage/org.argeo.tp/apache-sshd/merge.bnd
@@ -1,6 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
 Bundle-SymbolicName: org.apache.sshd
-Argeo-Origin-M2: :2.9.2
 Export-Package: org.apache.*
 Import-Package: \
 org.apache.tomcat.jni.*;resolution:=optional,\
diff --git a/repackage/org.argeo.tp/batik/common.bnd b/repackage/org.argeo.tp/batik/common.bnd
index 29f5f04..9e6d355 100644
--- a/repackage/org.argeo.tp/batik/common.bnd
+++ b/repackage/org.argeo.tp/batik/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :1.16
\ No newline at end of file
+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
index 785d44b..aa1f6da 100644
--- a/repackage/org.argeo.tp/batik/merge.bnd
+++ b/repackage/org.argeo.tp/batik/merge.bnd
@@ -1,6 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
 Bundle-SymbolicName: org.apache.batik
-Argeo-Origin-M2: :1.16
 Export-Package: org.apache.*
 Import-Package: \
 org.apache.batik.script.*;resolution:="optional",\
diff --git a/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd
new file mode 100644
index 0000000..fc8f2e0
--- /dev/null
+++ b/repackage/org.argeo.tp/com.apicatalog.jsonld.bnd
@@ -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/dbus-java/merge.bnd b/repackage/org.argeo.tp/dbus-java/merge.bnd
index ad44fa7..08bbf57 100644
--- a/repackage/org.argeo.tp/dbus-java/merge.bnd
+++ b/repackage/org.argeo.tp/dbus-java/merge.bnd
@@ -2,7 +2,7 @@ Bundle-SymbolicName: org.freeedesktop.dbus
 SPDX-License-Identifier: LGPL-2.0
 # TODO Check whether relicensing of this fork was allowed
 #SPDX-License-Identifier: MIT
-Argeo-Origin-M2: :4.3.0
+Argeo-Origin-M2: :4.3.1
 Export-Package: org.freedesktop.dbus.*
 Argeo-Origin-M2-Merge: \
 com.github.hypfvieh:dbus-java-core,\
diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd
index 71e2f19..faf3ecb 100644
--- a/repackage/org.argeo.tp/jackson/common.bnd
+++ b/repackage/org.argeo.tp/jackson/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.15.1
+Argeo-Origin-M2: :2.15.2
diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd
index 2c29670..f8a1d61 100644
--- a/repackage/org.argeo.tp/org.apache.commons.codec.bnd
+++ b/repackage/org.argeo.tp/org.apache.commons.codec.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-codec:commons-codec:1.15
+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
index 9ad7267..6236965 100644
--- a/repackage/org.argeo.tp/org.apache.commons.compress.bnd
+++ b/repackage/org.argeo.tp/org.apache.commons.compress.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-compress:1.23.0
+Argeo-Origin-M2: org.apache.commons:commons-compress:1.24.0
 Import-Package: \
 org.brotli.*;resolution:=optional,
 org.tukaani.*;resolution:=optional,
diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd
index 7581839..81629ea 100644
--- a/repackage/org.argeo.tp/org.apache.commons.io.bnd
+++ b/repackage/org.argeo.tp/org.apache.commons.io.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-io:commons-io:2.12.0
+Argeo-Origin-M2: commons-io:commons-io:2.14.0
 Import-Package: sun.*;resolution:=optional, *
diff --git a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
index e54669a..d09967e 100644
--- a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
+++ b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd
@@ -1,3 +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.72
\ No newline at end of file
+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.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd
index 9df3bcf..3fc89da 100644
--- a/repackage/org.argeo.tp/org.h2.bnd
+++ b/repackage/org.argeo.tp/org.h2.bnd
@@ -1,5 +1,8 @@
 SPDX-License-Identifier: MPL-2.0
+
 Argeo-Origin-M2: com.h2database:h2:2.1.214
+# New format (3) was introduced with 2.2.220
+#Argeo-Origin-M2: com.h2database:h2:2.2.220
 
 Import-Package:\
 jakarta.*;resolution:=optional,\
diff --git a/repackage/org.argeo.tp/parsson/merge.bnd b/repackage/org.argeo.tp/parsson/merge.bnd
new file mode 100644
index 0000000..a3b9d6e
--- /dev/null
+++ b/repackage/org.argeo.tp/parsson/merge.bnd
@@ -0,0 +1,10 @@
+Bundle-SymbolicName: org.eclipse.parsson
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
+Argeo-Origin-M2: :1.1.4
+Export-Package: org.eclipse.*, jakarta.*
+Import-Package:\
+org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
+*
+Argeo-Origin-M2-Merge: \
+org.eclipse.parsson:parsson,\
+jakarta.json:jakarta.json-api:2.1.2,\
\ No newline at end of file
diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp/xmlgraphics/merge.bnd
index ea8e74d..68f9c4d 100644
--- a/repackage/org.argeo.tp/xmlgraphics/merge.bnd
+++ b/repackage/org.argeo.tp/xmlgraphics/merge.bnd
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: Apache-2.0
 Bundle-SymbolicName: org.apache.xmlgraphics
-Argeo-Origin-M2: :2.8
+Argeo-Origin-M2: :2.9
 Argeo-Origin-M2-Merge: \
 org.apache.xmlgraphics:xmlgraphics-commons
 Export-Package: org.apache.xmlgraphics.*
diff --git a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties
index e8e614a..0e09a50 100644
--- a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties
+++ b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties
@@ -1,5 +1,5 @@
-plugins/javax.inject*.jar=
-plugins/javax.annotation*.jar=
+plugins/jakarta.inject*.jar=
+plugins/jakarta.annotation*.jar=
 plugins/org.eclipse.e4*.jar=
 plugins/org.eclipse.emf*.jar=
 plugins/org.eclipse.rap.e4_*.jar=
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
index a8755e1..97dd14f 100644
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
+++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties
@@ -1,5 +1,5 @@
-plugins/javax.inject*.jar=
-plugins/javax.annotation*.jar=
+plugins/jakarta.inject*.jar=
+plugins/jakarta.annotation*.jar=
 plugins/org.eclipse.text_*.jar=
 plugins/org.eclipse.core*.jar=
 plugins/org.eclipse.e4.*.jar=
diff --git a/repackage/uris.properties b/repackage/uris.properties
index 217bef9..b99bc54 100644
--- a/repackage/uris.properties
+++ b/repackage/uris.properties
@@ -1,4 +1,5 @@
-eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.27-202303020300/equinox-SDK-4.27.zip
-eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.27-202303020300/org.eclipse.platform.source-4.27.zip
-eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.24/e4/rap-e4-3.24.0-R-20230308-0917.zip
+eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.29-202309031000/equinox-SDK-4.29.zip
+eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.29-202309031000/org.eclipse.platform.source-4.29.zip
+eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.26/e4/rap-e4-3.26.0-R-20230906-1232.zip
+# Nebula does not seem to provide archives anymore, 3.1.0 is available only as an update site
 eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/3.0.0/repository-nebula-3.0.0.zip
\ No newline at end of file
diff --git a/sdk/argeo-build b/sdk/argeo-build
index d9cae87..d5943f5 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit d9cae87d811258d5a13e43eea8492f3792377ce4
+Subproject commit d5943f556d6fba9db0dd63d4c4cfceef89e4888e
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 81f345f..292c670 100644
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,4 +1,4 @@
 major=2
 minor=3
-micro=14
+micro=15
 qualifier=