From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 27 Jun 2024 08:05:04 +0000 (+0200)
Subject: Releasing
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=refs%2Fremotes%2Fgithub%2Funstable;hp=258585474100b9867d2309c481eefc07ff0c9dab;p=gpl%2Fargeo-tp.git

Releasing
---

diff --git a/rebuild/org.argeo.tp.sys/Makefile b/rebuild/org.argeo.tp.sys/Makefile
index 12499c4..ccebea8 100644
--- a/rebuild/org.argeo.tp.sys/Makefile
+++ b/rebuild/org.argeo.tp.sys/Makefile
@@ -13,11 +13,13 @@ ANGUS_BRANCH=2.0
 ANGUS_VERSION=$(ANGUS_BRANCH).3
 
 all: retrieve-angus-mbox osgi jni-angus-mbox
+	mkdir -p $(SDK_BUILD_BASE)/a2/$(TARGET_ARCH_CATEGORY_PREFIX)/$(A2_CATEGORY)
+	mv $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar $(SDK_BUILD_BASE)/a2/$(TARGET_ARCH_CATEGORY_PREFIX)/$(A2_CATEGORY)
 
 install:
 	mkdir -p $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY)
 	# Angus mbox
-	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar
+	$(INSTALL) $(A2_NATIVE_INSTALL_TARGET)/$(A2_CATEGORY) $(SDK_BUILD_BASE)/a2/$(TARGET_ARCH_CATEGORY_PREFIX)/$(A2_CATEGORY)/org.eclipse.angus.mail.mbox.$(ANGUS_BRANCH).jar
 	#$(INSTALL) $(A2_NATIVE_INSTALL_TARGET) $(A2_NATIVE_CATEGORY)/$(MBOX_TARGET_EXEC)
 	
 uninstall: osgi-uninstall
diff --git a/repackage/Makefile b/repackage/Makefile
index 37eb377..b9c6bfe 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -6,6 +6,7 @@ org.argeo.tp \
 org.argeo.tp.httpd \
 crypto/fips/org.argeo.tp.crypto \
 org.argeo.tp.sshd \
+osgi/equinox/org.argeo.tp.osgi.framework \
 osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 
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 ea1e11c..8418e50 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 @@
-Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.18
+Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.19
diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
index c924a57..5c4586c 100644
--- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
+++ b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
@@ -1,4 +1,4 @@
 SPDX-License-Identifier: MIT
 Argeo-Origin-NoMetadataGeneration: true
 Argeo-Origin-Do-Not-Modify: true
-Argeo-Origin-M2: :1.0.2.4
\ No newline at end of file
+Argeo-Origin-M2: :1.0.2.5
\ No newline at end of file
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 bde7d56..3390cb1 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.77
+Argeo-Origin-M2: :1.78.1
 Argeo-Origin-NoMetadataGeneration: true
 Argeo-Origin-Do-Not-Modify: true
diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
index b42bd2a..703511f 100644
--- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
+++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/org.apache.tomcat.jni.bnd
@@ -1,2 +1,4 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:10.1.19
\ No newline at end of file
+# Apache SSHD expects Tomcat JNI v9
+# (Tomcat JNI v10 causes java.lang.NoClassDefFoundError: org.apache.tomcat.jni.Local)
+Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.89
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd
index 56ffb4d..644f4ac 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: :30.1
+Argeo-Origin-M2: :31.2
 Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/
 
 Export-Package: org.geotools.*, org.w3.xlink.*
diff --git a/repackage/org.argeo.tp.earth/h2gis/common.bnd b/repackage/org.argeo.tp.earth/h2gis/common.bnd
index 8be57e7..20cbc43 100644
--- a/repackage/org.argeo.tp.earth/h2gis/common.bnd
+++ b/repackage/org.argeo.tp.earth/h2gis/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: LGPL-3.0-or-later
-Argeo-Origin-M2: :2.2.0
+Argeo-Origin-M2: :2.2.1
diff --git a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd
index 0febb55..76c5008 100644
--- a/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd
+++ b/repackage/org.argeo.tp.earth/h2gis/org.h2gis.bnd
@@ -1,2 +1,7 @@
 Argeo-Origin-M2: org.orbisgis:h2gis
 Fragment-Host: org.h2
+Import-Package:\
+com.google.flatbuffers.*;resolution:="optional",\
+net.sf.geographiclib.*;resolution:="optional",\
+org.wololo.flatgeobuf.*;resolution:="optional",\
+*
diff --git a/repackage/org.argeo.tp.earth/org.cts.bnd b/repackage/org.argeo.tp.earth/org.cts.bnd
index ec4c2c1..ffbf597 100644
--- a/repackage/org.argeo.tp.earth/org.cts.bnd
+++ b/repackage/org.argeo.tp.earth/org.cts.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: LGPL-3.0-or-later
-Argeo-Origin-M2: org.orbisgis:cts:1.7.0
-# TODO: 1.7.0 sources are missing in Maven central
+Argeo-Origin-M2: org.orbisgis:cts:1.7.1
+# TODO: 1.7.1 sources are missing in Maven central
diff --git a/repackage/org.argeo.tp.earth/org.poly2tri.bnd b/repackage/org.argeo.tp.earth/org.poly2tri.bnd
index 61a9634..76d9319 100644
--- a/repackage/org.argeo.tp.earth/org.poly2tri.bnd
+++ b/repackage/org.argeo.tp.earth/org.poly2tri.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.orbisgis:poly2tri:0.4.0
\ No newline at end of file
+Argeo-Origin-M2: org.orbisgis:poly2tri:0.7.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.earth/postgis/common.bnd b/repackage/org.argeo.tp.earth/postgis/common.bnd
index fa61071..975442a 100644
--- a/repackage/org.argeo.tp.earth/postgis/common.bnd
+++ b/repackage/org.argeo.tp.earth/postgis/common.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: LGPL-2.1-only
-Argeo-Origin-M2: :2021.1.0
+Argeo-Origin-M2: :2023.1.0
 Export-Package: net.postgis.*
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index 4bbcbe2..03a6c8a 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: :12.0.7
+Argeo-Origin-M2: :12.0.10
 # TODO split ee8 and ee10 ?
 Argeo-Origin-M2-Merge: \
 org.eclipse.jetty.websocket:jetty-websocket-core-client, \
diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd
index 33b0c1c..096adf1 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: :12.0.7
+Argeo-Origin-M2: :12.0.10
diff --git a/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd
index a45cbc9..7f324af 100644
--- a/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd
+++ b/repackage/org.argeo.tp.img/org.apache.commons.imaging.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: Apache-2.0
-Bundle-Version: 0.99.3
-Argeo-Origin-M2: org.apache.commons:commons-imaging:1.0-alpha3
+Bundle-Version: 0.99.5
+Argeo-Origin-M2: org.apache.commons:commons-imaging:1.0.0-alpha5
diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd
index cbf5742..d47ffd8 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.15
\ No newline at end of file
+Argeo-Origin-M2: :2.22.0
\ 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 388b664..ebc988d 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.60.0
\ No newline at end of file
+Argeo-Origin-M2: :1.64.0
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.math/units/merge.bnd b/repackage/org.argeo.tp.math/units/merge.bnd
index 3b9b42a..6c47c26 100644
--- a/repackage/org.argeo.tp.math/units/merge.bnd
+++ b/repackage/org.argeo.tp.math/units/merge.bnd
@@ -1,5 +1,6 @@
 SPDX-License-Identifier: BSD-3-Clause
 Bundle-SymbolicName: tech.units.indriya
+# Note: GeoTools is not compatible with v2.2
 Argeo-Origin-M2: :2.1.4
 Export-Package: javax.measure.*, tech.units.indriya.*, si.uom.*, systems.uom.*
 Import-Package: \
diff --git a/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd
index 720e04c..905e941 100644
--- a/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd
+++ b/repackage/org.argeo.tp.office/com.healthmarketscience.jackcess.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.5
\ No newline at end of file
+Argeo-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.6
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.office/log4j/common.bnd b/repackage/org.argeo.tp.office/log4j/common.bnd
index 6cd7b19..1608c61 100644
--- a/repackage/org.argeo.tp.office/log4j/common.bnd
+++ b/repackage/org.argeo.tp.office/log4j/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.20.0
+Argeo-Origin-M2: :2.23.0
diff --git a/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd
index dedd30c..14a8300 100644
--- a/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd
+++ b/repackage/org.argeo.tp.office/org.apache.xmlbeans.bnd
@@ -4,4 +4,4 @@ Import-Package: org.apache.tools.ant.*;resolution:=optional,
 net.sf.saxon.*;resolution:=optional,
 com.sun.*;resolution:=optional,
 *
-Argeo-Origin-M2: org.apache.xmlbeans:xmlbeans:5.2.0
+Argeo-Origin-M2: org.apache.xmlbeans:xmlbeans:5.2.1
diff --git a/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd b/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd
index a301d0e..8a6f906 100644
--- a/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd
+++ b/repackage/org.argeo.tp.publish/com.github.librepdf.openpdf.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: LGPL-2.1-only
-Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.33
+Argeo-Origin-M2: com.github.librepdf:openpdf:1.3.43
 Import-Package: \
 com.ibm.icu.*;resolution:=optional,\
 org.bouncycastle.*;resolution:="optional",\
diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd
index ca7beec..edfd4e7 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:3.0.1
+Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:3.0.2
 
 Import-Package: \
 sun.*;resolution:=optional, \
diff --git a/repackage/org.argeo.tp.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd
index c90afda..4c770ed 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: :3.0.1
\ No newline at end of file
+Argeo-Origin-M2: :3.0.2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd
index 1d28a12..4726cda 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.10.1
+Argeo-Origin-M2: :5.10.2
 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 98df23c..2fb8657 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.10.1
+Argeo-Origin-M2: :1.10.2
 Argeo-Origin-M2-Merge: \
 org.junit.platform:junit-platform-commons, \
 org.junit.platform:junit-platform-console, \
@@ -13,6 +13,8 @@ org.junit.platform:junit-platform-suite-engine, \
 org.junit.platform:junit-platform-testkit, \
 org.junit.platform:junit-platform-launcher, \
 
+Provide-Capability: org.junit.platform.launcher;org.junit.platform.launcher=junit-platform-launcher;version:Version="1.10.2"
+ 
 Export-Package: org.junit.platform.*
 
 Import-Package: \
diff --git a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd
index ff5349d..5349060 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.10.1
\ No newline at end of file
+Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.10.2
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd
index 245af47..9d8baf2 100644
--- a/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd
+++ b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd
@@ -1,2 +1,3 @@
 SPDX-License-Identifier: Apache-2.0
+# No sources available in v2.13.0
 Argeo-Origin-M2: :2.12.1
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.sys/activation/merge.bnd b/repackage/org.argeo.tp.sys/activation/merge.bnd
index 46bae12..1ca6d7c 100644
--- a/repackage/org.argeo.tp.sys/activation/merge.bnd
+++ b/repackage/org.argeo.tp.sys/activation/merge.bnd
@@ -1,13 +1,13 @@
 Bundle-SymbolicName: org.eclipse.angus.activation
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: :2.0.1
+Argeo-Origin-M2: :2.0.2
 Import-Package:\
 org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
 org.graalvm.*;resolution:="optional",\
 *
 
-Export-Package: org.eclipse.*, jakarta.*;version="2.1.2"
+Export-Package: org.eclipse.*, jakarta.*;version="2.1.3"
 
 Argeo-Origin-M2-Merge: \
 org.eclipse.angus:angus-activation,\
-jakarta.activation:jakarta.activation-api:2.1.2,\
+jakarta.activation:jakarta.activation-api:2.1.3,\
diff --git a/repackage/org.argeo.tp.sys/jackson/common.bnd b/repackage/org.argeo.tp.sys/jackson/common.bnd
index 1aaf767..89b086b 100644
--- a/repackage/org.argeo.tp.sys/jackson/common.bnd
+++ b/repackage/org.argeo.tp.sys/jackson/common.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: :2.16.0
+Argeo-Origin-M2: :2.17.1
diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd
index f8a1d61..1b3107d 100644
--- a/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-codec:commons-codec:1.16.0
+Argeo-Origin-M2: commons-codec:commons-codec:1.17.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
index 4b559e4..d438a5f 100644
--- a/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.compress.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-compress:1.25.0
+Argeo-Origin-M2: org.apache.commons:commons-compress:1.26.2
 Import-Package: \
 org.brotli.*;resolution:=optional,
 org.tukaani.*;resolution:=optional,
diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd
index acb2b43..85dcea8 100644
--- a/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.configuration2.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-configuration2:2.9.0
+Argeo-Origin-M2: org.apache.commons:commons-configuration2:2.11.0
 Import-Package: \
 org.apache.commons.jexl2.*;resolution:=optional,
 *
diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd
index 0607a8b..95caae8 100644
--- a/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd
+++ b/repackage/org.argeo.tp.sys/org.apache.commons.exec.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: org.apache.commons:commons-exec:1.3
+Argeo-Origin-M2: org.apache.commons:commons-exec:1.4.0
diff --git a/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd
index 7486670..442ffa4 100644
--- a/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd
+++ b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r
+Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-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
index 6bc5a2a..1e7bd51 100644
--- a/repackage/org.argeo.tp.sys/org.jline.bnd
+++ b/repackage/org.argeo.tp.sys/org.jline.bnd
@@ -1,9 +1,10 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.jline:jline:3.24.1
+Argeo-Origin-M2: org.jline:jline:3.26.2
 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",\
+java.lang.foreign.*;resolution:="optional",\
 *
diff --git a/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd
index 0dc40c0..53379af 100644
--- a/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd
+++ b/repackage/org.argeo.tp.sys/org.mozilla.universalchardet.bnd
@@ -1,2 +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
+Argeo-Origin-M2: com.github.albfernandez:juniversalchardet:2.5.0
diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd b/repackage/org.argeo.tp.utils/asm/common.bnd
index bb59a0f..f2848bf 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.6
+Argeo-Origin-M2: :9.7
diff --git a/repackage/org.argeo.tp.utils/com.dd.plist.bnd b/repackage/org.argeo.tp.utils/com.dd.plist.bnd
index dd4b5ef..44756f2 100644
--- a/repackage/org.argeo.tp.utils/com.dd.plist.bnd
+++ b/repackage/org.argeo.tp.utils/com.dd.plist.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: MIT
-Argeo-Origin-M2: com.googlecode.plist:dd-plist:1.27
\ No newline at end of file
+Argeo-Origin-M2: com.googlecode.plist:dd-plist:1.28
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd b/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd
index 2e44ac3..7d02c29 100644
--- a/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd
+++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: BSD-2-Clause
-Argeo-Origin-M2: net.sf.biweekly:biweekly:0.6.7
\ No newline at end of file
+Argeo-Origin-M2: net.sf.biweekly:biweekly:0.6.8
\ No newline at end of file
diff --git a/repackage/org.argeo.tp.utils/com.google.common.bnd b/repackage/org.argeo.tp.utils/com.google.common.bnd
new file mode 100644
index 0000000..0686b7f
--- /dev/null
+++ b/repackage/org.argeo.tp.utils/com.google.common.bnd
@@ -0,0 +1,10 @@
+SPDX-License-Identifier: Apache-2.0
+# Note: Used only by h2gis
+Argeo-Origin-M2: com.google.guava:guava:33.2.1-jre
+Bundle-Version: 33.2.1.jre
+Import-Package:\
+android.*;resolution:="optional",\
+com.google.*;resolution:="optional",\
+javax.annotation.*;resolution:="optional",\
+org.checkerframework.*;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 cb96722..c6949be 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.11.0
+Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.12.0
 
 Import-Package: javax.transaction.*; resolution:="optional",\
 *
diff --git a/repackage/org.argeo.tp.utils/org.xmlresolver.bnd b/repackage/org.argeo.tp.utils/org.xmlresolver.bnd
index 70cb2a2..fa2d37c 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.2
+Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.3
 Import-Package:\
 com.thaiopensource.*;resolution:="optional",\
 org.apache.xerces.*;resolution:="optional",\
diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd
index ba90127..f38bd10 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.9.1
+Argeo-Origin-M2: :2.9.2
 Export-Package: org.apache.*
 Import-Package: *;resolution:=optional
 Argeo-Origin-M2-Merge: \
diff --git a/repackage/org.argeo.tp/org.apache.commons.cli.bnd b/repackage/org.argeo.tp/org.apache.commons.cli.bnd
index e81875d..db9b3a9 100644
--- a/repackage/org.argeo.tp/org.apache.commons.cli.bnd
+++ b/repackage/org.argeo.tp/org.apache.commons.cli.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: commons-cli:commons-cli:1.6.0
+Argeo-Origin-M2: commons-cli:commons-cli:1.8.0
diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd
index 6df3327..57baa81 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.15.1
+Argeo-Origin-M2: commons-io:commons-io:2.16.1
 Import-Package: sun.*;resolution:=optional, *
diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd
index 3fc89da..10df674 100644
--- a/repackage/org.argeo.tp/org.h2.bnd
+++ b/repackage/org.argeo.tp/org.h2.bnd
@@ -1,8 +1,8 @@
 SPDX-License-Identifier: MPL-2.0
 
-Argeo-Origin-M2: com.h2database:h2:2.1.214
+#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
+Argeo-Origin-M2: com.h2database:h2:2.2.224
 
 Import-Package:\
 jakarta.*;resolution:=optional,\
diff --git a/repackage/org.argeo.tp/parsson/merge.bnd b/repackage/org.argeo.tp/parsson/merge.bnd
index 85f3f80..9c06ddf 100644
--- a/repackage/org.argeo.tp/parsson/merge.bnd
+++ b/repackage/org.argeo.tp/parsson/merge.bnd
@@ -1,6 +1,6 @@
 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.5
+Argeo-Origin-M2: :1.1.6
 Export-Package: org.eclipse.*, jakarta.*
 Import-Package:\
 org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/common.bnd
new file mode 100644
index 0000000..2c682bb
--- /dev/null
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/common.bnd
@@ -0,0 +1,3 @@
+SPDX-License-Identifier: EPL-2.0
+Argeo-Origin-NoMetadataGeneration: true
+Argeo-Origin-KeepModuleInfo: true
diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/includes.properties
new file mode 100644
index 0000000..1f77045
--- /dev/null
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi.framework/eclipse-equinox/includes.properties
@@ -0,0 +1,2 @@
+plugins/org.eclipse.osgi_*.jar=
+plugins/org.eclipse.osgi.source_*.jar=
diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
index 3ce71c6..38f9c23 100644
--- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/includes.properties
@@ -1,5 +1,3 @@
-plugins/org.eclipse.osgi_*.jar=
-plugins/org.eclipse.osgi.source_*.jar=
 plugins/org.eclipse.osgi.util*.jar=
 plugins/org.eclipse.osgi.services*.jar=
 plugins/org.osgi.service.*.jar=
diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd b/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd
deleted file mode 100644
index ac2786b..0000000
--- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/com.sun.jna.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Fake JNA bundle
-# FIXME make it smaller
-Argeo-Origin-M2: net.java.dev.jna:jna:5.13.0
-SPDX-License-Identifier: Apache-2.0
-Export-Package:
diff --git a/repackage/uris.properties b/repackage/uris.properties
index dc52bb4..7c360a3 100644
--- a/repackage/uris.properties
+++ b/repackage/uris.properties
@@ -1,5 +1,5 @@
-eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.31-202402290520/equinox-SDK-4.31.zip
-eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.31-202402290520/org.eclipse.platform.source-4.31.zip
-eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.28/e4/rap-e4-3.28.0-R-20240306-1417.zip
+eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.32-202406010610/equinox-SDK-4.32.zip
+eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.32-202406010610/org.eclipse.platform.source-4.32.zip
+eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.29/e4/rap-e4-3.29.0-R-20240605-1615.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 3473c4e..41680d0 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 3473c4ec64851e97b6d0bb29fe41370c13af7b27
+Subproject commit 41680d087920a1994af93eb851d77116d0f7f933
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 120b4cc..e33f76e 100644
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,4 +1,4 @@
 major=2
 minor=3
-micro=18
-qualifier=.next
+micro=19
+qualifier=
diff --git a/sdk/output-argeo-tp-platform.target b/sdk/output-argeo-tp-platform.target
index 65865cd..ee8fedb 100644
--- a/sdk/output-argeo-tp-platform.target
+++ b/sdk/output-argeo-tp-platform.target
@@ -5,6 +5,7 @@
 		<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/osgi/equinox/org.argeo.tp.osgi.framework" 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"/>