From 3c0e250caf33064292a986afa816130b99484405 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 20 Jul 2023 08:33:24 +0200 Subject: [PATCH] Update libraries versions --- .../org.argeo.tp.crypto/bouncycastle/common.bnd | 2 +- repackage/org.argeo.tp.earth/geotools/merge.bnd | 2 +- repackage/org.argeo.tp.publish/pdfbox/common.bnd | 2 +- repackage/org.argeo.tp.utils/asm/common.bnd | 2 +- .../org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd | 2 +- repackage/org.argeo.tp.utils/net.sf.saxon.bnd | 2 +- repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd | 2 +- repackage/org.argeo.tp.utils/xalan/merge.bnd | 15 +++++++++++++++ repackage/org.argeo.tp/apache-sshd/merge.bnd | 1 - repackage/org.argeo.tp/batik/merge.bnd | 1 - repackage/org.argeo.tp/jackson/common.bnd | 2 +- .../org.argeo.tp/org.apache.commons.codec.bnd | 2 +- repackage/org.argeo.tp/org.apache.commons.io.bnd | 2 +- repackage/org.argeo.tp/org.apache.tomcat.jni.bnd | 2 +- repackage/org.argeo.tp/org.h2.bnd | 3 +++ 15 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 repackage/org.argeo.tp.utils/xalan/merge.bnd 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 85574ab..01f643c 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.73 +Argeo-Origin-M2: :1.75 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 2a8d4a3..5835747 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.1 +Argeo-Origin-M2: :29.2 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.publish/pdfbox/common.bnd b/repackage/org.argeo.tp.publish/pdfbox/common.bnd index 0a280f1..692f4cb 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.28 \ No newline at end of file +Argeo-Origin-M2: :2.0.29 \ 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 cc32d2b..167015e 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.4 +Argeo-Origin-M2: :9.5 diff --git a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd index 66fc30a..2c219c2 100644 --- a/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd +++ b/repackage/org.argeo.tp.utils/com.adobe.xmp.xmpcore.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: BSD-3-Clause # No source available in Maven Central for 6.1.11 -Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.10 +Argeo-Origin-M2: com.adobe.xmp:xmpcore:6.1.11 diff --git a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd index a22d535..2b64c2c 100644 --- a/repackage/org.argeo.tp.utils/net.sf.saxon.bnd +++ b/repackage/org.argeo.tp.utils/net.sf.saxon.bnd @@ -1,5 +1,5 @@ SPDX-License-Identifier: MPL-2.0 -Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.2 +Argeo-Origin-M2: net.sf.saxon:Saxon-HE:12.3 Import-Package:\ com.sun.org.apache.xerces.internal.jaxp;resolution:="optional",\ jline.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd b/repackage/org.argeo.tp.utils/org.eclipse.jgit.bnd index 5ad0391..84e02ac 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.5.0.202303070854-r +Argeo-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r Import-Package: \ sun.*;resolution:=optional, \ com.jcraft.jsch;resolution:=optional, \ diff --git a/repackage/org.argeo.tp.utils/xalan/merge.bnd b/repackage/org.argeo.tp.utils/xalan/merge.bnd new file mode 100644 index 0000000..adb8fd0 --- /dev/null +++ b/repackage/org.argeo.tp.utils/xalan/merge.bnd @@ -0,0 +1,15 @@ +Bundle-SymbolicName: org.apache.xalan +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: :2.7.2 +# v2.7.3 does not provides sources in Maven Central +#Argeo-Origin-M2: :2.7.3 +Export-Package: org.apache.* +Argeo-Origin-M2-Merge: \ +xalan:xalan,\ +xalan:serializer,\ + +Import-Package: \ +javax.xml.*;resolution:="optional", \ +org.w3c.*;resolution:="optional", \ +org.xml.*;resolution:="optional", \ +* diff --git a/repackage/org.argeo.tp/apache-sshd/merge.bnd b/repackage/org.argeo.tp/apache-sshd/merge.bnd index b8ab9a6..d65c5cc 100644 --- a/repackage/org.argeo.tp/apache-sshd/merge.bnd +++ b/repackage/org.argeo.tp/apache-sshd/merge.bnd @@ -1,6 +1,5 @@ SPDX-License-Identifier: Apache-2.0 Bundle-SymbolicName: org.apache.sshd -Argeo-Origin-M2: :2.9.2 Export-Package: org.apache.* Import-Package: \ org.apache.tomcat.jni.*;resolution:=optional,\ diff --git a/repackage/org.argeo.tp/batik/merge.bnd b/repackage/org.argeo.tp/batik/merge.bnd index 785d44b..aa1f6da 100644 --- a/repackage/org.argeo.tp/batik/merge.bnd +++ b/repackage/org.argeo.tp/batik/merge.bnd @@ -1,6 +1,5 @@ SPDX-License-Identifier: Apache-2.0 Bundle-SymbolicName: org.apache.batik -Argeo-Origin-M2: :1.16 Export-Package: org.apache.* Import-Package: \ org.apache.batik.script.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd index 71e2f19..faf3ecb 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.15.1 +Argeo-Origin-M2: :2.15.2 diff --git a/repackage/org.argeo.tp/org.apache.commons.codec.bnd b/repackage/org.argeo.tp/org.apache.commons.codec.bnd index 2c29670..f8a1d61 100644 --- a/repackage/org.argeo.tp/org.apache.commons.codec.bnd +++ b/repackage/org.argeo.tp/org.apache.commons.codec.bnd @@ -1,2 +1,2 @@ SPDX-License-Identifier: Apache-2.0 -Argeo-Origin-M2: commons-codec:commons-codec:1.15 +Argeo-Origin-M2: commons-codec:commons-codec:1.16.0 diff --git a/repackage/org.argeo.tp/org.apache.commons.io.bnd b/repackage/org.argeo.tp/org.apache.commons.io.bnd index 7581839..a69182d 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.12.0 +Argeo-Origin-M2: commons-io:commons-io:2.13.0 Import-Package: sun.*;resolution:=optional, * diff --git a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd index e54669a..d09967e 100644 --- a/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd +++ b/repackage/org.argeo.tp/org.apache.tomcat.jni.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: Apache-2.0 # Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11 -Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.72 \ No newline at end of file +Argeo-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.78 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.h2.bnd b/repackage/org.argeo.tp/org.h2.bnd index 9df3bcf..3fc89da 100644 --- a/repackage/org.argeo.tp/org.h2.bnd +++ b/repackage/org.argeo.tp/org.h2.bnd @@ -1,5 +1,8 @@ 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.220 Import-Package:\ jakarta.*;resolution:=optional,\ -- 2.30.2