From: Mathieu Baudier Date: Wed, 24 May 2023 06:53:00 +0000 (+0200) Subject: Update third parties versions and add Saxon and JLine X-Git-Tag: v2.3.13~4 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=26a275bed197df22a2ea9c5baf5f0833efc3f38f Update third parties versions and add Saxon and JLine --- diff --git a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd index 86d4e74..af90715 100644 --- a/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd +++ b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd @@ -1 +1 @@ -Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on:1.72.2 +Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on 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 9b6ceeb..85574ab 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.72 +Argeo-Origin-M2: :1.73 Argeo-Origin-NoMetadataGeneration: true Argeo-Origin-Do-Not-Modify: true diff --git a/repackage/org.argeo.tp.earth/geotools/merge.bnd b/repackage/org.argeo.tp.earth/geotools/merge.bnd index d7d5600..2a8d4a3 100644 --- a/repackage/org.argeo.tp.earth/geotools/merge.bnd +++ b/repackage/org.argeo.tp.earth/geotools/merge.bnd @@ -1,6 +1,6 @@ SPDX-License-Identifier: LGPL-2.1-only Bundle-SymbolicName: org.geotools -Argeo-Origin-M2: :29.0 +Argeo-Origin-M2: :29.1 Argeo-Origin-M2-Repo: https://repo.osgeo.org/repository/release/ Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.* diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd index 7bed46c..7612c79 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.14 +Argeo-Origin-M2: :10.0.15 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 4ed3c60..a4e02f0 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.14 +Argeo-Origin-M2: :10.0.15 diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd index 0e41b93..29be7dc 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.9 \ No newline at end of file +Argeo-Origin-M2: :2.20.10 \ 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 8a2ba95..e907d29 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.48.0 \ No newline at end of file +Argeo-Origin-M2: :1.52.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 d027b3d..e77efdd 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.42 +Argeo-Origin-M2: :0.43 Export-Package: org.ejml.* Argeo-Origin-M2-Merge: \ org.ejml:ejml-core, \ 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 ae90d96..e159513 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.42 +Argeo-Origin-M2: de.rototor.pdfbox:graphics2d:0.43 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 2c9d220..0a280f1 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.27 \ No newline at end of file +Argeo-Origin-M2: :2.0.28 \ 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 b77f78e..a57dd47 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.1 +Argeo-Origin-M2: :5.9.3 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 459af4d..b8d5cb5 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.1 +Argeo-Origin-M2: :1.9.3 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 994f6e3..2b1ab94 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.1 \ No newline at end of file +Argeo-Origin-M2: org.junit.vintage:junit-vintage-engine:5.9.3 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.dd.plist.bnd b/repackage/org.argeo.tp.utils/com.dd.plist.bnd index 002f91a..dd4b5ef 100644 --- a/repackage/org.argeo.tp.utils/com.dd.plist.bnd +++ b/repackage/org.argeo.tp.utils/com.dd.plist.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: MIT -Argeo-Origin-M2: com.googlecode.plist:dd-plist:1.26 \ No newline at end of file +Argeo-Origin-M2: com.googlecode.plist:dd-plist:1.27 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd b/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd index 7f62b39..421ace3 100644 --- a/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd +++ b/repackage/org.argeo.tp.utils/com.googlecode.javaewah.JavaEWAH.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.1.13 +Argeo-Origin-M2: com.googlecode.javaewah:JavaEWAH:1.2.3 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd new file mode 100644 index 0000000..a22d535 --- /dev/null +++ b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd @@ -0,0 +1,6 @@ +SPDX-License-Identifier: MPL-2.0 +Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.2 +Import-Package:\ +com.sun.org.apache.xerces.internal.jaxp;resolution:="optional",\ +jline.*;resolution:="optional",\ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd index a4dd759..d80056d 100644 --- a/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.santuario.xmlsec.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.2 +Argeo-Origin-M2: org.apache.santuario:xmlsec:2.3.3 diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd index 39037df..5ad0391 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.4.0.202211300538-r +Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r Import-Package: \ sun.*;resolution:=optional, \ com.jcraft.jsch;resolution:=optional, \ diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd index d3b7ee6..fd0587d 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.7.0 +Argeo-Origin-M2: :2.8.0 Export-Package: org.apache.* Import-Package: *;resolution:=optional Argeo-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp/apache-sshd/common.bnd b/repackage/org.argeo.tp/apache-sshd/common.bnd index 9aacdb5..8c69a5a 100644 --- a/repackage/org.argeo.tp/apache-sshd/common.bnd +++ b/repackage/org.argeo.tp/apache-sshd/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.9.2 \ No newline at end of file +Argeo-Origin-M2: :2.10.0 \ 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 fdba8cd..ad44fa7 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.2.1 +Argeo-Origin-M2: :4.3.0 Export-Package: org.freedesktop.dbus.* Argeo-Origin-M2-Merge: \ com.github.hypfvieh:dbus-java-core,\ diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd index c4a8a64..71e2f19 100644 --- a/repackage/org.argeo.tp/jackson/common.bnd +++ b/repackage/org.argeo.tp/jackson/common.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: :2.14.2 +Argeo-Origin-M2: :2.15.1 diff --git a/repackage/org.argeo.tp/org.apache.commons.compress.bnd b/repackage/org.argeo.tp/org.apache.commons.compress.bnd index 9e9a654..9ad7267 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.22 +Argeo-Origin-M2: org.apache.commons:commons-compress:1.23.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 377f2b7..7581839 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.11.0 +Argeo-Origin-M2: commons-io:commons-io:2.12.0 Import-Package: sun.*;resolution:=optional, * diff --git a/repackage/org.argeo.tp/org.apache.xerces.bnd b/repackage/org.argeo.tp/org.apache.xerces.bnd index e5c551a..bb75013 100644 --- a/repackage/org.argeo.tp/org.apache.xerces.bnd +++ b/repackage/org.argeo.tp/org.apache.xerces.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: xerces:xercesImpl:2.12.2 Import-Package:\ sun.*;resolution:=optional,\ * -Argeo-Origin-M2: xerces:xercesImpl:2.12.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.jline.bnd b/repackage/org.argeo.tp/org.jline.bnd new file mode 100644 index 0000000..acb514c --- /dev/null +++ b/repackage/org.argeo.tp/org.jline.bnd @@ -0,0 +1,7 @@ +SPDX-License-Identifier: BSD-3-Clause +Argeo-Origin-M2: org.jline:jline:3.23.0 +Import-Package:\ +sun.misc.*;resolution:="optional",\ +com.sun.jna.*;resolution:="optional",\ +org.fusesource.jansi.*;resolution:="optional",\ +* diff --git a/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd b/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd new file mode 100644 index 0000000..0dc40c0 --- /dev/null +++ b/repackage/org.argeo.tp/org.mozilla.universalchardet.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: LGPL-3.0-only OR GPL-3.0-only OR MPL-1.0 +Argeo-Origin-M2: com.github.albfernandez:juniversalchardet:2.4.0 diff --git a/repackage/org.argeo.tp/org.postgresql.jdbc.bnd b/repackage/org.argeo.tp/org.postgresql.jdbc.bnd index 5500e57..445e23e 100644 --- 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.5.4 +Argeo-Origin-M2: org.postgresql:postgresql:42.6.0 Import-Package:\ org.osgi.service.jdbc;resolution:="optional",\ com.sun.jna.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp/org.xmlresolver.bnd b/repackage/org.argeo.tp/org.xmlresolver.bnd new file mode 100644 index 0000000..246043a --- /dev/null +++ b/repackage/org.argeo.tp/org.xmlresolver.bnd @@ -0,0 +1,8 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: org.xmlresolver:xmlresolver:5.2.0 +Import-Package:\ +com.thaiopensource.*;resolution:="optional",\ +org.apache.xerces.*;resolution:="optional",\ +org.apache.hc.client5.*;resolution:="optional",\ +org.apache.hc.core5.*;resolution:="optional",\ +*