Update platform third-party versions

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
deleted file mode 100644 (file)
index 4788299..0000000
--- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd.disabled
+++ /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/common.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
index 5c4586c6171511bbdf07a8289a2e035bf2033b36..61652b12fafde026ffbcfd3a0f8f85b972b5cb72 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,5 @@
 SPDX-License-Identifier: MIT
+# FIXME OSGi metadata not available in BC FIPS v2.0.0
 Argeo-Origin-NoMetadataGeneration: true
 Argeo-Origin-Do-Not-Modify: true
 Argeo-Origin-M2: :1.0.2.5
\ No newline at end of file

diff --git a/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd b/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
deleted file mode 100644 (file)
index c53f340..0000000
--- a/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-SPDX-License-Identifier: CC0-1.0
-Argeo-Origin-M2: net.i2p.crypto:eddsa:0.3.0
-Import-Package: \
-sun.*;resolution:="optional", \
-*

diff --git a/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd.disabled b/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd.disabled
new file mode 100644 (file)
index 0000000..c53f340
--- /dev/null
+++ b/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd.disabled
@@ -0,0 +1,5 @@
+SPDX-License-Identifier: CC0-1.0
+Argeo-Origin-M2: net.i2p.crypto:eddsa:0.3.0
+Import-Package: \
+sun.*;resolution:="optional", \
+*

diff --git a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
index 454c4b2ab7361de5a23a0db391111fadf87c446a..94c0224e46ad1f716e8be485443c0e2853c69663 100644 (file)
--- a/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/linux/aarch64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.14.0
+Argeo-Origin-M2: :5.15.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
index 454c4b2ab7361de5a23a0db391111fadf87c446a..94c0224e46ad1f716e8be485443c0e2853c69663 100644 (file)
--- a/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/linux/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.14.0
+Argeo-Origin-M2: :5.15.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
index 454c4b2ab7361de5a23a0db391111fadf87c446a..94c0224e46ad1f716e8be485443c0e2853c69663 100644 (file)
--- a/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/macosx/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.14.0
+Argeo-Origin-M2: :5.15.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
index 454c4b2ab7361de5a23a0db391111fadf87c446a..94c0224e46ad1f716e8be485443c0e2853c69663 100644 (file)
--- a/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
+++ b/repackage/lib/win32/x86_64/org.argeo.tp.sys/jna/common.bnd
@@ -1,2 +1,2 @@
-Argeo-Origin-M2: :5.14.0
+Argeo-Origin-M2: :5.15.0
 SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0

diff --git a/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd
index 57e156a1881c6dfc7a4f5d704551bc51716acb1c..4cbde3827f1521b2eaaba4ece0f027a4f6ccc114 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd
+++ b/repackage/org.argeo.tp.httpd/jakarta.servlet.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:6.0.0
+Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:6.1.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd b/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd
index bdd56339f53ae45d432fe9871990ed7c2cc0a124..562a1f11dea27626c3fe2e9557636b0fa25463f4 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd
+++ b/repackage/org.argeo.tp.httpd/jakarta.websocket.bnd
@@ -1,3 +1,3 @@
 SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-api:2.0.0
+Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-client-api:2.2.0
 Argeo-Origin-NoMetadataGeneration: true

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

diff --git a/repackage/org.argeo.tp.httpd/javax.websocket.bnd b/repackage/org.argeo.tp.httpd/javax.websocket.bnd
deleted file mode 100644 (file)
index 33979a3..0000000
--- a/repackage/org.argeo.tp.httpd/javax.websocket.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1
-Argeo-Origin-M2: jakarta.websocket:jakarta.websocket-api:1.1.2
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index dbf623953d71ece7dd3f64019e9c256d53d21304..70e0ba9e86c71a14ee51f9ab78636dd1e8cdb470 100644 (file)
--- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
+++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
@@ -1,7 +1,6 @@
 Bundle-SymbolicName: org.eclipse.jetty.websocket
 SPDX-License-Identifier: Apache-2.0 OR EPL-2.0
 Argeo-Origin-M2: :12.0.13
-# TODO split ee8 and ee10 ?
 Argeo-Origin-M2-Merge: \
 org.eclipse.jetty.websocket:jetty-websocket-core-client, \
 org.eclipse.jetty.websocket:jetty-websocket-core-common, \
@@ -10,13 +9,6 @@ org.eclipse.jetty.websocket:jetty-websocket-jetty-api, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-client, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-common, \
 org.eclipse.jetty.websocket:jetty-websocket-jetty-server,\
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet, \
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-common, \
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-api, \
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client, \
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common, \
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server,\
-org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-jetty-server, \
 org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet, \
 org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client, \
 org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common, \
@@ -27,6 +19,5 @@ Export-Package: org.eclipse.jetty.*
 
 Import-Package: \
 !java.*, \
-org.eclipse.jetty.ee8.webapp;resolution:="optional", \
 org.eclipse.jetty.ee10.webapp;resolution:="optional", \
 *
\ 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 ebc988d6ec563b34af135652115ef6a95ffdbc04..0fecb710001d782ccf9c2445559777a0aac6b915 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
-Argeo-Origin-M2: :1.64.0
\ No newline at end of file
+Argeo-Origin-M2: :1.68.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.ml/com.fasterxml.jackson.core.jackson.dataformat.yaml.bnd b/repackage/org.argeo.tp.ml/com.fasterxml.jackson.core.jackson.dataformat.yaml.bnd
deleted file mode 100644 (file)
index 3f096a7..0000000
--- a/repackage/org.argeo.tp.ml/com.fasterxml.jackson.core.jackson.dataformat.yaml.bnd
+++ /dev/null
@@ -1,4 +0,0 @@
-#FIXME: keep version in sync with sys!
-SPDX-License-Identifier: Apache-2.0
-Argeo-Origin-M2: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.1
-Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd
index 4726cdab8e11209c00040a25a28547516ad418f8..b52c73bf844275d5b19051e85672b3edbe4d83e9 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
-Argeo-Origin-M2: :5.10.2
+Argeo-Origin-M2: :5.11.1
 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 2fb8657a8f0da6fa23d6af7d08458363b1fcb581..217715785d39b69bbecbfb8f3cfdf03363f0b7f0 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
-Argeo-Origin-M2: :1.10.2
+Argeo-Origin-M2: :1.11.1
 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.hamcrest.core.bnd b/repackage/org.argeo.tp.sdk/org.hamcrest.core.bnd
index cc2f2b32e1258966bd906e23860e76e29bf3f6b0..74a26afda1f31ae585a5f1bf5f32e2a45ea126e8 100644 (file)
--- a/repackage/org.argeo.tp.sdk/org.hamcrest.core.bnd
+++ b/repackage/org.argeo.tp.sdk/org.hamcrest.core.bnd
@@ -1,2 +1,3 @@
 SPDX-License-Identifier: BSD-3-Clause
+# Note: we stick with v1.3, since this is what JUnit uses
 Argeo-Origin-M2: org.hamcrest:hamcrest-core:1.3

diff --git a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd
index 53490608c494ac2b674564407db4e48c3f4f4de6..b7217413d14732408a7c487ce4af7f25442552e9 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,3 @@
 SPDX-License-Identifier: EPL-2.0
-Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.10.2
\ No newline at end of file
+# TODO Put it in the merged jar, since it is always the same version?
+Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.11.1
\ No newline at end of file

diff --git a/repackage/org.argeo.tp.sdk/org.redline-rpm.bnd b/repackage/org.argeo.tp.sdk/org.redline-rpm.bnd
index 7633ae105fd8d2eb670479fd6463dab523eda818..33bc9850d6b686b023df8bb6da58790b11260102 100644 (file)
--- a/repackage/org.argeo.tp.sdk/org.redline-rpm.bnd
+++ b/repackage/org.argeo.tp.sdk/org.redline-rpm.bnd
@@ -1,6 +1,7 @@
 SPDX-License-Identifier: MIT
+# TODO Check whether this project is dead
+Argeo-Origin-M2: org.redline-rpm:redline:1.2.10
 Import-Package: sun.security.*;resolution:=optional,
 org.apache.tools.ant.*;resolution:=optional,
 org.apache.tools.zip;resolution:=optional,
 *
-Argeo-Origin-M2: org.redline-rpm:redline:1.2.10

diff --git a/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd
index 9d8baf29c962bf00dbf145ff9d50598848e51fef..2aa6ff63d1149d5f81f1f69b6108d6785acb7351 100644 (file)
--- a/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd
+++ b/repackage/org.argeo.tp.sshd/apache-sshd/common.bnd
@@ -1,3 +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
+Argeo-Origin-M2: :2.13.2

diff --git a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
index 202f175decd3760f48aefa6c88216d3f3dfe85f4..43eca9c767e039b2796fd8683cc8c9e3371d1dc3 100644 (file)
--- a/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
+++ b/repackage/org.argeo.tp.sys/com.sun.jna.platform.bnd
@@ -1,3 +1,3 @@
-Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.14.0
+Argeo-Origin-M2: net.java.dev.jna:jna-platform:5.15.0
 SPDX-License-Identifier: Apache-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.dataformat.yaml.bnd b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.dataformat.yaml.bnd
new file mode 100644 (file)
index 0000000..66a7646
--- /dev/null
+++ b/repackage/org.argeo.tp.sys/jackson/com.fasterxml.jackson.core.jackson.dataformat.yaml.bnd
@@ -0,0 +1,4 @@
+# Note: no needed in platform but by some fancy libraries in apps.
+# Since it is small, we keep it here, in order to avoid duplication of version maintenance
+Argeo-Origin-M2: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
+Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd b/repackage/org.argeo.tp.sys/org.apache.commons.codec.bnd
index 1b3107d0320974a7787b574a1a45f7e5a49f602c..685b075451234e7589ac412ec3b9ae7d72aea19d 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
-Argeo-Origin-M2: commons-codec:commons-codec:1.17.0
+Argeo-Origin-M2: commons-codec:commons-codec:1.17.1

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 d438a5f5be641a0cafdbb99286745e3343bac83c..27d8f5bee4081817c6a0195b3fb490cff85d78b8 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
-Argeo-Origin-M2: org.apache.commons:commons-compress:1.26.2
+Argeo-Origin-M2: org.apache.commons:commons-compress:1.27.1
 Import-Package: \
 org.brotli.*;resolution:=optional,
 org.tukaani.*;resolution:=optional,

diff --git a/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.sys/org.eclipse.jgit.bnd
index 442ffa4515f3563cfdb44dfc8cd2baee43bd0723..17b6135a8c78f5768f6bd75923ab808451ca68c5 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
-Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r
+Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-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 1e7bd51657cf7d0915fdef1fbe3f70924af7029a..2fc94f3410692b98179c49ec8f920bb96dd5d8dd 100644 (file)
--- a/repackage/org.argeo.tp.sys/org.jline.bnd
+++ b/repackage/org.argeo.tp.sys/org.jline.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.jline:jline:3.26.2
+Argeo-Origin-M2: org.jline:jline:3.26.3
 Import-Package:\
 sun.misc.*;resolution:="optional",\
 com.sun.jna.*;resolution:="optional",\

diff --git a/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd
index a58ae5bc51684063f6d9a59d75e00b65484591ba..389aa589479ed6ad5508aba59b327d7c2cad6fb9 100644 (file)
--- a/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd
+++ b/repackage/org.argeo.tp.sys/org.tukaani.xz.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: CC0-1.0
-Argeo-Origin-M2: org.tukaani:xz:1.9
+Argeo-Origin-M2: org.tukaani:xz:1.10

diff --git a/repackage/org.argeo.tp.sys/org.xbill.dns.bnd b/repackage/org.argeo.tp.sys/org.xbill.dns.bnd
index f4be4d7261d7d56f8b28c911c2d7b66ecdc21071..cb09f279844739b16679f8fa4160ad5e3b856cd0 100644 (file)
--- a/repackage/org.argeo.tp.sys/org.xbill.dns.bnd
+++ b/repackage/org.argeo.tp.sys/org.xbill.dns.bnd
@@ -1,4 +1,4 @@
 # this is actually dnsjava, see https://github.com/dnsjava/dnsjava
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: dnsjava:dnsjava:3.6.1
+Argeo-Origin-M2: dnsjava:dnsjava:3.6.2
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp/dbus-java/merge.bnd b/repackage/org.argeo.tp/dbus-java/merge.bnd
index a9fba6a441b53d74a53b6bf535e95ff6231c1d5d..083a6966d86702396aaea1ff9a14c5ccc12a5d3f 100644 (file)
--- a/repackage/org.argeo.tp/dbus-java/merge.bnd
+++ b/repackage/org.argeo.tp/dbus-java/merge.bnd
@@ -2,6 +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
+# TODO: stuck with v4.x because de.thjom.java.systemd is not compatible with v5.x
 Argeo-Origin-M2: :4.3.2
 Export-Package: org.freedesktop.dbus.*
 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 db9b3a97a5b5170c0db9983d51121d37a57bfe33..9e5210817e780314573f824a56fea207297e47d0 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
-Argeo-Origin-M2: commons-cli:commons-cli:1.8.0
+Argeo-Origin-M2: commons-cli:commons-cli:1.9.0

diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd
index 57baa817ad733db4df0bc466919ecc4be6672d75..5cd3f2fd09dfac8ea2d5a3976dc0cc769a6698fd 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
-Argeo-Origin-M2: commons-io:commons-io:2.16.1
+Argeo-Origin-M2: commons-io:commons-io:2.17.0
 Import-Package: sun.*;resolution:=optional, *

diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd
index 1901a3a67a4645ad58b5c578e6b904233f121a9e..9f4d5b0b2478df3d8586c6eb51c6dfc940200f9b 100644 (file)
--- a/repackage/org.argeo.tp/org.h2.bnd
+++ b/repackage/org.argeo.tp/org.h2.bnd
@@ -2,7 +2,7 @@ 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.224
+Argeo-Origin-M2: com.h2database:h2:2.3.232
 
 Import-Package:\
 jakarta.*;resolution:=optional,\

diff --git a/repackage/org.argeo.tp/org.locationtech.jts.bnd b/repackage/org.argeo.tp/org.locationtech.jts.bnd
index b163e3a8cdbe64e05751d299b7d406064d1ee699..3667a374a09c461cc6becb955b4fabbdce9e116a 100644 (file)
--- a/repackage/org.argeo.tp/org.locationtech.jts.bnd
+++ b/repackage/org.argeo.tp/org.locationtech.jts.bnd
@@ -1,2 +1,2 @@
 SPDX-License-Identifier: BSD-3-Clause
-Argeo-Origin-M2: org.locationtech.jts:jts-core:1.19.0
\ No newline at end of file
+Argeo-Origin-M2: org.locationtech.jts:jts-core:1.20.0
\ No newline at end of file

diff --git a/repackage/org.argeo.tp/org.postgresql.jdbc.bnd b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd
index 2a3c33d3218372749f580a5f63b89475527518f1..401f7d0f23967fbed3ea7410fe75ad9363fbae83 100644 (file)
--- a/repackage/org.argeo.tp/org.postgresql.jdbc.bnd
+++ b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd
@@ -1,5 +1,5 @@
 SPDX-License-Identifier: BSD-2-Clause
-Argeo-Origin-M2: org.postgresql:postgresql:42.7.3
+Argeo-Origin-M2: org.postgresql:postgresql:42.7.4
 Import-Package:\
 org.osgi.service.jdbc;resolution:="optional",\
 com.sun.jna.*;resolution:="optional",\

diff --git a/repackage/org.argeo.tp/parsson/merge.bnd b/repackage/org.argeo.tp/parsson/merge.bnd
index 9c06ddf3ebb2f683991f5fdc296ae8696889d032..a41365da97cd8240f7756e35a8be78d8bbf5f936 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
-Argeo-Origin-M2: :1.1.6
+Argeo-Origin-M2: :1.1.7
 Export-Package: org.eclipse.*, jakarta.*
 Import-Package:\
 org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\

diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.servlet.bnd b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.servlet.bnd
deleted file mode 100644 (file)
index 559cbe3..0000000
--- a/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.servlet.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: EPL-2.0
-Argeo-Origin-M2: org.osgi:org.osgi.service.servlet:2.0.0
-#Argeo-Origin-NoMetadataGeneration: true

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