Update third party 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 7de0139b04d254dd2b9498f449536193ed3d1ef4..d1ad75a79b85de9fb2d539ff7d8b0c56f613860d 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,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 01f643ce0115150ce799d1c121525ff3187cdf5e..108ed45a581858e40c6f41a1852dcb5188b4b7ae 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
-Argeo-Origin-M2: :1.75
+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/eclipse-rcp/common.bnd b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
index 8c4c7a44789654f94371e141be363da12af03e89..7cff62dcd1d8709d0c5d65d397e410eda5483eff 100644 (file)
--- a/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
+++ b/repackage/lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd
@@ -1,2 +1,3 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+# JNA license
+SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.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
index 8c4c7a44789654f94371e141be363da12af03e89..7cff62dcd1d8709d0c5d65d397e410eda5483eff 100644 (file)
--- 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
@@ -1,2 +1,3 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+# JNA license
+SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.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
index 8c4c7a44789654f94371e141be363da12af03e89..7cff62dcd1d8709d0c5d65d397e410eda5483eff 100644 (file)
--- 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
@@ -1,2 +1,3 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+# JNA license
+SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.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
index 8c4c7a44789654f94371e141be363da12af03e89..7cff62dcd1d8709d0c5d65d397e410eda5483eff 100644 (file)
--- 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
@@ -1,2 +1,3 @@
-SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+# JNA license
+SPDX-License-Identifier: LGPL-2.1-or-later OR Apache-2.0
 Argeo-Origin-NoMetadataGeneration: true

diff --git a/repackage/org.argeo.tp.earth/org.picocontainer.bnd.disabled b/repackage/org.argeo.tp.earth/org.picocontainer.bnd.disabled
deleted file mode 100644 (file)
index 4b3d161..0000000
--- a/repackage/org.argeo.tp.earth/org.picocontainer.bnd.disabled
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: BSD-2-Clause 
-Argeo-Origin-M2: org.picocontainer:picocontainer:1.2
-DynamicImport-Package: *

diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd
index 7612c79dfddc01fa84fba709f287ca0c1940d9db..cd469827d7fc170385f1b24cf7df459e5af9e3cb 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
-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 a4e02f0040b6f6104d9c51249a4b7127a37d0d77..a648fcbac6b992c6395b1fecf967f14705aa84f6 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
-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 29be7dc36daa11580a68504b764008df80bc2a6b..0a2abe6193123bc129250f9e0195cddd2f1dd138 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
-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 e907d29cdb7000c0be07485cbb2fede304ea7b63..eadd95e5014245b77bc1af490ededddc30648d0c 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.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 e77efddbe309f376b18168c6e1858d5faac2afb8..8a1518d9115865dad20d97e8088f5b460f832cdf 100644 (file)
--- 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 66536adc4fb0a896cf0027a62d7dcaeef3b99d73..e030d3eb6411d582678a6858466ff99328afc5ad 100644 (file)
--- 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 e1595133160ea993624acf7d8a29078abba7a969..ea833ff598b40e834cde4339bf95218e7359ae52 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
-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 c532bd7a8858c11c3ad105610b4b097de6c7e5a6..b1dce982850012fc54c8f298329c434d0325829c 100644 (file)
--- 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 e0ca825b079fb11970851fc187a7d939c7ba9635..b0550e4e2f49eba6260926be27efa079e171eb10 100644 (file)
--- 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 692f4cbf6b3c55869753a5f5f70964f04df306dc..973e8a1f8b6f5515526e8822f9d29ec6de5e9425 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
-Argeo-Origin-M2: :2.0.29
\ 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 (file)
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 a57dd47b09fbcbd68838309ecd44dd117128ed5f..865c6ea0ceb2540ce2bee75e3742752629e56456 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.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 b8d5cb5ad4a1ecedf55f87dc4c556cacc030e9c5..0ca0cc2bdb4a6fef63f99b3df03126feb72112c2 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.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 2b1ab94f941b60965a86e6e2cf1a8f009bf8e1c2..52acae72abe9efd908ba2233c12601d37d44b8eb 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
-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 7622d976f671b9921480b983bd6fb7b7e184d771..3196a8ad85889c528f200fbadc801fd3b05ca22b 100644 (file)
--- 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 167015ec0aa1d227de1827997b15ec2233dea885..bb59a0fece06299cdcc3975f4469fbe7d7ed0f98 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
-Argeo-Origin-M2: :9.5
+Argeo-Origin-M2: :9.6

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 09fbdccd83a5f994510ddfde45a9e83ff455a058..f7557de868db86bba4a5b06c7d943d756146d91a 100644 (file)
--- 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 6850718ef9ff055344caeb95a06e981abcae60fc..6aa27d10929b315ef9124d089eb69ec0f317dd2f 100644 (file)
--- 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 0f1f4be89277f3f765f68096349393ac45caa816..20e1f0da7fd6837d3c8a938cbb821a02b2b86ac4 100644 (file)
--- 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/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd
index 1f6e450f541c5ef780ae12b575c5366d13bbea8a..0aea1a9c83612679595109238809bbb687dbaf69 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
-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 e90caec1f8906c2acd50d6915f2aa7ece53b916f..47b6b65ecd51a6fa6d42fc7568ff13d03fba4954 100644 (file)
--- 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 6826ceae0e8599a2efab38a3799cca7c42a50cc9..5b4d3891ee0b244a936aaa530b849d2b684d26d7 100644 (file)
--- 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 84e02ac385f5c3063034947df9c98b528f62d843..8f66eadd37cb2f03ca22a911a14b17c569207c4f 100644 (file)
--- 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.6.0.202305301015-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.xmlresolver.bnd b/repackage/org.argeo.tp.utils/org.xmlresolver.bnd
index 246043abf5e5fc0c8314727484aad81349aad992..70cb2a282db6a1a23267401ee3edf9a9a13465c3 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
-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/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd
index fd0587dcd246cc07b25dee442a4d2b029a14d38a..9c0021b4299c1fef84f6bbce231df20a1ed4299e 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
-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/batik/common.bnd b/repackage/org.argeo.tp/batik/common.bnd
index 29f5f04260f06e44546a921766fc722df461ae8b..9e6d3558f28526ba318f10681537b4f5112ccfa3 100644 (file)
--- 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/dbus-java/merge.bnd b/repackage/org.argeo.tp/dbus-java/merge.bnd
index ad44fa718eebf565e7179dddcb8afae6413dd9f7..08bbf57b3bd02372ee4535cfb430cad53d952106 100644 (file)
--- 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/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd
index 9ad726792f5b369d4972de50f568c475a2345efd..62369657d372bbe1c9078ed3d5d22026d95a1e7e 100644 (file)
--- 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 a69182de3204da348dc581ea447fb7b1ed14b51a..81629ead501ae9fdb1f9cec064f5b8b01fb4be60 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.13.0
+Argeo-Origin-M2: commons-io:commons-io:2.14.0
 Import-Package: sun.*;resolution:=optional, *

diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp/xmlgraphics/merge.bnd
index ea8e74d0b1e88aba9dcddb9f2cc5c386d5b5e6ed..68f9c4dc1ee02771721ef53e7a0793d06c724bc2 100644 (file)
--- 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 e8e614aa7d49ac80563609b95c389fdf79ea4b26..0e09a508f4663c0fcbfc932637e3abe813dce37c 100644 (file)
--- 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 a8755e14018bf9c9f7471d5a91449a4ac22358f0..97dd14f6457366095791a76dfc9163181c4111ec 100644 (file)
--- 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 6d21d7f526c4e1b3d459d4d8ee40f65e6e5ac9b0..b99bc54cd4ed49da6439fa123fbe04004392e49e 100644 (file)
--- a/repackage/uris.properties
+++ b/repackage/uris.properties
@@ -1,4 +1,5 @@
-eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.28-202306050440/equinox-SDK-4.28.zip
-eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.28-202306050440/org.eclipse.platform.source-4.28.zip
-eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.25/e4/rap-e4-3.25.0-R-20230607-1411.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 9c4c34355d1c499d63f698d2c92d03e3e8253919..2853e74b366a47909bd7404e23d9e660b449a4e6 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 9c4c34355d1c499d63f698d2c92d03e3e8253919
+Subproject commit 2853e74b366a47909bd7404e23d9e660b449a4e6