From 34825148abfd185002366eb0cc165109f431f958 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 7 Oct 2023 07:59:26 +0200 Subject: [PATCH] Update third party versions --- .../fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd | 3 ++- .../full/org.argeo.tp.crypto/bouncycastle/common.bnd | 2 +- .../lib/linux/aarch64/org.argeo.tp/eclipse-rcp/common.bnd | 3 ++- .../lib/linux/x86_64/org.argeo.tp/eclipse-rcp/common.bnd | 3 ++- .../lib/macosx/x86_64/org.argeo.tp/eclipse-rcp/common.bnd | 3 ++- .../lib/win32/x86_64/org.argeo.tp/eclipse-rcp/common.bnd | 3 ++- .../org.argeo.tp.earth/org.picocontainer.bnd.disabled | 3 --- repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd | 2 +- repackage/org.argeo.tp.httpd/jetty/common.bnd | 2 +- repackage/org.argeo.tp.jcr/jackrabbit/common.bnd | 2 +- repackage/org.argeo.tp.jcr/oak/common.bnd | 2 +- repackage/org.argeo.tp.math/ejml/merge.bnd | 2 +- repackage/org.argeo.tp.office/poi/common.bnd | 2 +- .../org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd | 2 +- repackage/org.argeo.tp.publish/flying-saucer/common.bnd | 2 +- repackage/org.argeo.tp.publish/fop/merge.bnd | 2 +- repackage/org.argeo.tp.publish/pdfbox/common.bnd | 2 +- .../org.argeo.tp.publish/pdfbox/org.apache.pdfbox.io.bnd | 1 + repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd | 2 +- repackage/org.argeo.tp.sdk/junit-platform/merge.bnd | 2 +- repackage/org.argeo.tp.sdk/org.junit.vintage.bnd | 2 +- repackage/org.argeo.tp.sdk/org.opentest4j.bnd | 2 +- repackage/org.argeo.tp.utils/asm/common.bnd | 2 +- .../org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd | 2 +- repackage/org.argeo.tp.utils/com.graphbuilder.bnd | 2 +- repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd | 2 +- repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd | 2 +- repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd | 2 +- repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd | 2 +- repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd | 2 +- repackage/org.argeo.tp.utils/org.xmlresolver.bnd | 2 +- repackage/org.argeo.tp.utils/tika/merge.bnd | 2 +- repackage/org.argeo.tp/batik/common.bnd | 2 +- repackage/org.argeo.tp/dbus-java/merge.bnd | 2 +- repackage/org.argeo.tp/org.apache.commons.compress.bnd | 2 +- repackage/org.argeo.tp/org.apache.commons.io.bnd | 2 +- repackage/org.argeo.tp/xmlgraphics/merge.bnd | 2 +- .../eclipse-rap/includes.properties | 4 ++-- .../eclipse-rcp/includes.properties | 4 ++-- repackage/uris.properties | 7 ++++--- sdk/argeo-build | 2 +- 41 files changed, 50 insertions(+), 46 deletions(-) delete mode 100644 repackage/org.argeo.tp.earth/org.picocontainer.bnd.disabled create mode 100644 repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.io.bnd diff --git a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd index 7de0139..d1ad75a 100644 --- a/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd +++ b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd @@ -1 +1,2 @@ -Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.14.1 +# 1.0.17 in Maven seems to be broken (no OSGi metad data, not signed) +Argeo-Origin-M2: org.bouncycastle:bctls-fips:1.0.16 diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd index 01f643c..108ed45 100644 --- a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd +++ b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd @@ -1,4 +1,4 @@ SPDX-License-Identifier: MIT -Argeo-Origin-M2: :1.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 8c4c7a4..7cff62d 100644 --- 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 8c4c7a4..7cff62d 100644 --- 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 8c4c7a4..7cff62d 100644 --- 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 8c4c7a4..7cff62d 100644 --- 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 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 7612c79..cd46982 100644 --- a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :10.0.15 +Argeo-Origin-M2: :10.0.16 Argeo-Origin-M2-Merge: \ org.eclipse.jetty.websocket:websocket-core-client, \ org.eclipse.jetty.websocket:websocket-core-common, \ diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd index a4e02f0..a648fcb 100644 --- a/repackage/org.argeo.tp.httpd/jetty/common.bnd +++ b/repackage/org.argeo.tp.httpd/jetty/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 OR EPL-2.0 -Argeo-Origin-M2: :10.0.15 +Argeo-Origin-M2: :10.0.16 diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd index 29be7dc..0a2abe6 100644 --- a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd +++ b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.20.10 \ No newline at end of file +Argeo-Origin-M2: :2.20.12 \ No newline at end of file diff --git a/repackage/org.argeo.tp.jcr/oak/common.bnd b/repackage/org.argeo.tp.jcr/oak/common.bnd index e907d29..eadd95e 100644 --- a/repackage/org.argeo.tp.jcr/oak/common.bnd +++ b/repackage/org.argeo.tp.jcr/oak/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :1.52.0 \ No newline at end of file +Argeo-Origin-M2: :1.56.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.math/ejml/merge.bnd b/repackage/org.argeo.tp.math/ejml/merge.bnd index e77efdd..8a1518d 100644 --- a/repackage/org.argeo.tp.math/ejml/merge.bnd +++ b/repackage/org.argeo.tp.math/ejml/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.ejml SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :0.43 +Argeo-Origin-M2: :0.43.1 Export-Package: org.ejml.* Argeo-Origin-M2-Merge: \ org.ejml:ejml-core, \ diff --git a/repackage/org.argeo.tp.office/poi/common.bnd b/repackage/org.argeo.tp.office/poi/common.bnd index 66536ad..e030d3e 100644 --- a/repackage/org.argeo.tp.office/poi/common.bnd +++ b/repackage/org.argeo.tp.office/poi/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :5.2.3 \ No newline at end of file +Argeo-Origin-M2: :5.2.4 \ No newline at end of file diff --git a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd index e159513..ea833ff 100644 --- a/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd +++ b/repackage/org.argeo.tp.publish/de.rototor.pdfbox.graphics2d.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.43 +Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:3.0.0 Import-Package: \ sun.*;resolution:=optional, \ diff --git a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd index c532bd7..b1dce98 100644 --- a/repackage/org.argeo.tp.publish/flying-saucer/common.bnd +++ b/repackage/org.argeo.tp.publish/flying-saucer/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: LGPL-3.0-only -Argeo-Origin-M2: :9.1.22 \ No newline at end of file +Argeo-Origin-M2: :9.3.1 \ No newline at end of file diff --git a/repackage/org.argeo.tp.publish/fop/merge.bnd b/repackage/org.argeo.tp.publish/fop/merge.bnd index e0ca825..b0550e4 100644 --- a/repackage/org.argeo.tp.publish/fop/merge.bnd +++ b/repackage/org.argeo.tp.publish/fop/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: Apache-2.0 Bundle-SymbolicName: org.apache.fop -Argeo-Origin-M2: :2.8 +Argeo-Origin-M2: :2.9 Argeo-Origin-M2-Merge: \ org.apache.xmlgraphics:fop-core,\ org.apache.xmlgraphics:fop-util,\ diff --git a/repackage/org.argeo.tp.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd index 692f4cb..973e8a1 100644 --- a/repackage/org.argeo.tp.publish/pdfbox/common.bnd +++ b/repackage/org.argeo.tp.publish/pdfbox/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.0.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 index 0000000..d4cf21a --- /dev/null +++ b/repackage/org.argeo.tp.publish/pdfbox/org.apache.pdfbox.io.bnd @@ -0,0 +1 @@ +Argeo-Origin-M2: org.apache.pdfbox:pdfbox-io diff --git a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd index a57dd47..865c6ea 100644 --- a/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd +++ b/repackage/org.argeo.tp.sdk/junit-jupiter/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: EPL-2.0 Bundle-SymbolicName: org.junit.jupiter -Argeo-Origin-M2: :5.9.3 +Argeo-Origin-M2: :5.10.0 Argeo-Origin-M2-Merge: \ org.junit.jupiter:junit-jupiter-api, \ org.junit.jupiter:junit-jupiter-engine, \ diff --git a/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd b/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd index b8d5cb5..0ca0cc2 100644 --- a/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd +++ b/repackage/org.argeo.tp.sdk/junit-platform/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: EPL-2.0 Bundle-SymbolicName: org.junit.platform -Argeo-Origin-M2: :1.9.3 +Argeo-Origin-M2: :1.10.0 Argeo-Origin-M2-Merge: \ org.junit.platform:junit-platform-commons, \ org.junit.platform:junit-platform-console, \ diff --git a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd index 2b1ab94..52acae7 100644 --- a/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd +++ b/repackage/org.argeo.tp.sdk/org.junit.vintage.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: EPL-2.0 -Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.9.3 \ No newline at end of file +Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.10.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.sdk/org.opentest4j.bnd b/repackage/org.argeo.tp.sdk/org.opentest4j.bnd index 7622d97..3196a8a 100644 --- a/repackage/org.argeo.tp.sdk/org.opentest4j.bnd +++ b/repackage/org.argeo.tp.sdk/org.opentest4j.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.opentest4j:opentest4j:1.2.0 \ No newline at end of file +Argeo-Origin-M2: org.opentest4j:opentest4j:1.3.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/asm/common.bnd b/repackage/org.argeo.tp.utils/asm/common.bnd index 167015e..bb59a0f 100644 --- a/repackage/org.argeo.tp.utils/asm/common.bnd +++ b/repackage/org.argeo.tp.utils/asm/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: :9.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 09fbdcc..f7557de 100644 --- a/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd +++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: BSD-2-Clause -Argeo-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.12.0 +Argeo-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.12.1 Import-Package: \ freemarker.*;resolution:="optional", \ com.fasterxml.jackson.*;resolution:="optional", \ diff --git a/repackage/org.argeo.tp.utils/com.graphbuilder.bnd b/repackage/org.argeo.tp.utils/com.graphbuilder.bnd index 6850718..6aa27d1 100644 --- a/repackage/org.argeo.tp.utils/com.graphbuilder.bnd +++ b/repackage/org.argeo.tp.utils/com.graphbuilder.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: com.github.virtuald:curvesapi:1.07 +Argeo-Origin-M2: com.github.virtuald:curvesapi:1.08 diff --git a/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd b/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd index 0f1f4be..20e1f0d 100644 --- a/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd +++ b/repackage/org.argeo.tp.utils/com.zaxxer.sparsebits.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: com.zaxxer:SparseBitSet:1.2 +Argeo-Origin-M2: com.zaxxer:SparseBitSet:1.3 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd index 1f6e450..0aea1a9 100644 --- a/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.dbcp2.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.9.0 +Argeo-Origin-M2: org.apache.commons:commons-dbcp2:2.10.0 Import-Package: javax.transaction.*; resolution:="optional",\ * diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd index e90caec..47b6b65 100644 --- a/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.lang3.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-lang3:3.12.0 +Argeo-Origin-M2: org.apache.commons:commons-lang3:3.13.0 diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd index 6826cea..5b4d389 100644 --- a/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.pool2.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-pool2:2.11.1 +Argeo-Origin-M2: org.apache.commons:commons-pool2:2.12.0 diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd index 84e02ac..8f66ead 100644 --- a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd +++ b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: BSD-3-Clause -Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.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 246043a..70cb2a2 100644 --- a/repackage/org.argeo.tp.utils/org.xmlresolver.bnd +++ b/repackage/org.argeo.tp.utils/org.xmlresolver.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.0 +Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.2 Import-Package:\ com.thaiopensource.*;resolution:="optional",\ org.apache.xerces.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd index fd0587d..9c0021b 100644 --- a/repackage/org.argeo.tp.utils/tika/merge.bnd +++ b/repackage/org.argeo.tp.utils/tika/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.apache.tika SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.8.0 +Argeo-Origin-M2: :2.9.0 Export-Package: org.apache.* Import-Package: *;resolution:=optional Argeo-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp/batik/common.bnd b/repackage/org.argeo.tp/batik/common.bnd index 29f5f04..9e6d355 100644 --- a/repackage/org.argeo.tp/batik/common.bnd +++ b/repackage/org.argeo.tp/batik/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :1.16 \ No newline at end of file +Argeo-Origin-M2: :1.17 \ No newline at end of file diff --git a/repackage/org.argeo.tp/dbus-java/merge.bnd b/repackage/org.argeo.tp/dbus-java/merge.bnd index ad44fa7..08bbf57 100644 --- a/repackage/org.argeo.tp/dbus-java/merge.bnd +++ b/repackage/org.argeo.tp/dbus-java/merge.bnd @@ -2,7 +2,7 @@ Bundle-SymbolicName: org.freeedesktop.dbus SPDX-License-Identifier: LGPL-2.0 # TODO Check whether relicensing of this fork was allowed #SPDX-License-Identifier: MIT -Argeo-Origin-M2: :4.3.0 +Argeo-Origin-M2: :4.3.1 Export-Package: org.freedesktop.dbus.* Argeo-Origin-M2-Merge: \ com.github.hypfvieh:dbus-java-core,\ diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd index 9ad7267..6236965 100644 --- a/repackage/org.argeo.tp/org.apache.commons.compress.bnd +++ b/repackage/org.argeo.tp/org.apache.commons.compress.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.commons:commons-compress:1.23.0 +Argeo-Origin-M2: org.apache.commons:commons-compress:1.24.0 Import-Package: \ org.brotli.*;resolution:=optional, org.tukaani.*;resolution:=optional, diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd index a69182d..81629ea 100644 --- a/repackage/org.argeo.tp/org.apache.commons.io.bnd +++ b/repackage/org.argeo.tp/org.apache.commons.io.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: commons-io:commons-io:2.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 ea8e74d..68f9c4d 100644 --- a/repackage/org.argeo.tp/xmlgraphics/merge.bnd +++ b/repackage/org.argeo.tp/xmlgraphics/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: Apache-2.0 Bundle-SymbolicName: org.apache.xmlgraphics -Argeo-Origin-M2: :2.8 +Argeo-Origin-M2: :2.9 Argeo-Origin-M2-Merge: \ org.apache.xmlgraphics:xmlgraphics-commons Export-Package: org.apache.xmlgraphics.* diff --git a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties index e8e614a..0e09a50 100644 --- a/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties +++ b/repackage/swt/rap/org.argeo.tp.swt.workbench/eclipse-rap/includes.properties @@ -1,5 +1,5 @@ -plugins/javax.inject*.jar= -plugins/javax.annotation*.jar= +plugins/jakarta.inject*.jar= +plugins/jakarta.annotation*.jar= plugins/org.eclipse.e4*.jar= plugins/org.eclipse.emf*.jar= plugins/org.eclipse.rap.e4_*.jar= diff --git a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties index a8755e1..97dd14f 100644 --- a/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties +++ b/repackage/swt/rcp/org.argeo.tp.swt.workbench/eclipse-rcp/includes.properties @@ -1,5 +1,5 @@ -plugins/javax.inject*.jar= -plugins/javax.annotation*.jar= +plugins/jakarta.inject*.jar= +plugins/jakarta.annotation*.jar= plugins/org.eclipse.text_*.jar= plugins/org.eclipse.core*.jar= plugins/org.eclipse.e4.*.jar= diff --git a/repackage/uris.properties b/repackage/uris.properties index 6d21d7f..b99bc54 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,4 +1,5 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.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 9c4c343..2853e74 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 9c4c34355d1c499d63f698d2c92d03e3e8253919 +Subproject commit 2853e74b366a47909bd7404e23d9e660b449a4e6 -- 2.30.2