Update third party libraries versions

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 ea1e11cca8ce2c1c26ccaa333bd865490f9144c0..8418e50865f6166b1bd294dcb5a57ffee2ace83b 100644 (file)
--- 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 c924a57ca90cc39f115b4f66153f5377c0f181c4..5c4586c6171511bbdf07a8289a2e035bf2033b36 100644 (file)
--- 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
 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 bde7d567f9164b09f89ed00a1bd127804540adc5..3390cb1237c6be33247a9f4aa087fb256954ae77 100644 (file)
--- 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
 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
 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 b42bd2a9c98da4d5cc48ead71999a08d41e2d695..703511f670e773d309ea467985d8033108fa9e19 100644 (file)
--- 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
 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 56ffb4daedc26403f73b51bc84b22dd85cdd08bf..644f4aca6fa55ebe592c279e55da022ae6b142f7 100644 (file)
--- 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
 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.*
 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 8be57e7b8217a26d8f3f0e991610152ddc5368d9..20cbc43ee768fc11d52ef99d4d533d018d977b1d 100644 (file)
--- 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
 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 0febb5512b2924d7dead93c08e3cf3276f6c4742..76c500885e7c6b9edc15a50b1a35005fa4b7097d 100644 (file)
--- 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
 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 ec4c2c1adcbb14e5b48763366df71328408b44c3..ffbf597045a0038a08fc4215dc3e23df2474ae5d 100644 (file)
--- 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
 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 61a9634578ff281c55338930bb807f8ae709bad3..76d9319fae94c82cbbff09a8ee7c165e83c19fe3 100644 (file)
--- 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
 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 fa61071a16e1d2e3ddc83d365264c5acd6cceac0..975442aa2037a5bf56e680e5c5bd728f904fc130 100644 (file)
--- 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
 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
 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 4bbcbe29a94a75a91ce5a2f6e83e4f88ba1ae2e0..03a6c8ab3cc8593daaeb732352127d923b04e0f3 100644 (file)
--- 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
 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, \
 # 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 33b0c1ce0733e64752519e5e972e183fcdaf326d..096adf135a6c60183fa8995340c1f006a92ba680 100644 (file)
--- 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
 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 a45cbc91c8c5bea2dfada8770f5d93ef94327248..7f324afd9a3be920187e8d3c8502854103b4631c 100644 (file)
--- 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
 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 cbf57426218b5d780315a4a437243f8895ccf0bf..d47ffd8dea6deb955e15a1b35567ab9dccc051ba 100644 (file)
--- 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
 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 388b664954eaecdd7381dca8228e76c24b3220a5..ebc988d6ec563b34af135652115ef6a95ffdbc04 100644 (file)
--- 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
 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 3b9b42a64ff8f79fd51b254c0bef0e3eec459be1..6c47c267dc02eda3f4f360f5cd05c8b2f21cb895 100644 (file)
--- 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
 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: \
 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 720e04c9ae4ee8dd77fc0e6daab521bb21fb5d5d..905e9419cb96527f86b849b47f143ebb260cc479 100644 (file)
--- 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
 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 6cd7b1939fd793349002b9603301b4ccf8093b7e..1608c618fd19b9057407d84fece127d9b0f7fd2f 100644 (file)
--- 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
 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 dedd30cce1f0f9a3fe9900a31bbb9bf7325cfb29..14a8300a310fab103ba3db4a8d4d60ca8bca0ce1 100644 (file)
--- 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,
 *
 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 a301d0e6a36cdda0d292c6ca995e0b5ccf84d3c1..8a6f906ab35faeac3069cab72a4d90185f92fa20 100644 (file)
--- 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
 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",\
 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 ca7beecf676075022f71da8982d1e79f1bf316bd..edfd4e728f19602b9a83cae1d39320c539d234fb 100644 (file)
--- 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
 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, \
 
 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 c90afda442d0ff71c58f3a78bb991ae18652a017..4c770edcc7b95b617d87564c3db2ecec9dc2a1d9 100644 (file)
--- 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
 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 1d28a12b17b63703d156f947d7e9c9c2389bb98f..4726cdab8e11209c00040a25a28547516ad418f8 100644 (file)
--- 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
 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, \
 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 98df23cdb6cbc57c38cd2f46a6042adabb8b6753..a0d7c108da173914ecf8c2048015480f302dd249 100644 (file)
--- 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
 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, \
 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 ff5349d1ceb461b2fb70a2e8319d304a96ca043c..53490608c494ac2b674564407db4e48c3f4f4de6 100644 (file)
--- 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
 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 245af476ba793845d7218db685eb8700f0cc3426..9d8baf29c962bf00dbf145ff9d50598848e51fef 100644 (file)
--- 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
 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
 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 46bae12077e6d7d32eeb0e737a91f44f54e4c535..1ca6d7ccef00110b1bee18bcf7bd11f496142636 100644 (file)
--- 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
 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",\
 *
 
 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,\
 
 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 1aaf767b541c1d8332ba168a1392608e6a3f2c7b..89b086becee002c000ee87bb6d335e6b3d4644b7 100644 (file)
--- 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
 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 f8a1d6189999b442cab84aefd21a02fd0d139c9c..1b3107d0320974a7787b574a1a45f7e5a49f602c 100644 (file)
--- 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
 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 4b559e4c1c94bb5095b59fff515c5c898401cbc2..d438a5f5be641a0cafdbb99286745e3343bac83c 100644 (file)
--- 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
 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,
 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 acb2b439dc78e487ff1b83600d5723cab18520d4..85dcea809d706d4d2b44075dde3bd7f1b2b91408 100644 (file)
--- 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
 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,
 *
 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 0607a8b5d92205f781b05c0f007f5fb5708c9325..95caae81881788b1b35a10cc339cfb693b7e816b 100644 (file)
--- 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
 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 74866705a916c14792ea8d08ea0c4a52c636a7ae..442ffa4515f3563cfdb44dfc8cd2baee43bd0723 100644 (file)
--- 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
 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, \
 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 6bc5a2a98bb33910aafe0b99e028906fc9ddb3a6..1e7bd51657cf7d0915fdef1fbe3f70924af7029a 100644 (file)
--- 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
 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",\
 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 0dc40c05bee87a6c0d6ddc75ee95456618029d0d..53379af6867d4058f48d3d79ff711ecd01c367f5 100644 (file)
--- 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
 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 bb59a0fece06299cdcc3975f4469fbe7d7ed0f98..f2848bf0c6259b6612114b9db2532b1457532e59 100644 (file)
--- 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
 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 dd4b5ef8cb645d6bd40b0aeec0e3f4a315b5cec7..44756f216434c4cc04cfe3d37da798c58515909d 100644 (file)
--- 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
 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 2e44ac3569d28a4e901d7d9b2e299c2a2ce0d0e9..7d02c2953a3121d8e62a6a752c1f514cd505e2c6 100644 (file)
--- 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
 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 (file)
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 cb967222c284d2c3120cacc81945b4d55996b033..c6949be51d28fe45c5b8baf6f2045cb302dba376 100644 (file)
--- 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
 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",\
 *
 
 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 70cb2a282db6a1a23267401ee3edf9a9a13465c3..fa2d37c2248750b67c7eeeb6ea22c59fd7769343 100644 (file)
--- 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
 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",\
 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 ba90127c3ee8470802804e617b2cb28e3bc1086a..f38bd10896c58fc86516bfe366c67863c7cf0566 100644 (file)
--- 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
 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: \
 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 e81875d54727d6c41fc0df4c605039852fddb0e5..db9b3a97a5b5170c0db9983d51121d37a57bfe33 100644 (file)
--- 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
 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 6df33273a35f23878d157ebd1e76dec9f8067275..57baa817ad733db4df0bc466919ecc4be6672d75 100644 (file)
--- 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
 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, *
 Import-Package: sun.*;resolution:=optional, *

diff --git a/repackage/org.argeo.tp/parsson/merge.bnd b/repackage/org.argeo.tp/parsson/merge.bnd
index 85f3f80f4483269d67355aeeb551d9ad24e191be..9c06ddf3ebb2f683991f5fdc296ae8696889d032 100644 (file)
--- 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
 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",\
 Export-Package: org.eclipse.*, jakarta.*
 Import-Package:\
 org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\

diff --git a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
index 743e1d35b9bf18163748d8a0207963a83cab1ac4..555e3867948af8e53acbf4578554169390bd1053 100644 (file)
--- a/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
+++ b/repackage/osgi/equinox/org.argeo.tp.osgi/eclipse-equinox/common.bnd
@@ -1,2 +1,3 @@
 SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true
 SPDX-License-Identifier: EPL-2.0
 Argeo-Origin-NoMetadataGeneration: true

+#Argeo-Origin-KeepModuleInfo: true

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 (file)
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 dc52bb4ca752efa19bc0eb6db1b122ee83887fd7..7c360a3d63d18c62de8464bdf5da7ed6e85ccf92 100644 (file)
--- 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
 # 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 3473c4ec64851e97b6d0bb29fe41370c13af7b27..09077e4ece9ea6d8e0b442084a80103bd5733b4b 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 3473c4ec64851e97b6d0bb29fe41370c13af7b27
+Subproject commit 09077e4ece9ea6d8e0b442084a80103bd5733b4b