From d531ee12a6849f13b4b55971de51b7ceba4d8d55 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 3 Mar 2023 13:25:33 +0100 Subject: [PATCH] Update third-parties versions --- Makefile | 4 ++-- repackage/eclipse.mirrors.txt | 4 ++-- repackage/org.argeo.tp.crypto/apache-sshd/common.bnd | 2 +- repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd | 2 +- repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd | 2 +- repackage/org.argeo.tp.gis/ejml/merge.bnd | 2 +- repackage/org.argeo.tp.gis/geotools/merge.bnd | 2 +- repackage/org.argeo.tp.gis/h2gis/common.bnd | 2 +- repackage/org.argeo.tp.jcr/jackrabbit/common.bnd | 2 +- repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd | 2 +- repackage/org.argeo.tp.jetty/jetty/common.bnd | 2 +- .../org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd | 2 +- repackage/org.argeo.tp.poi/log4j/common.bnd | 2 +- .../org.eclipse.jdt.core.compiler.batch.bnd | 2 +- repackage/org.argeo.tp.sql/org.postgresql.bnd | 2 +- .../org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd | 2 +- .../org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd | 2 +- .../org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd | 2 +- repackage/org.argeo.tp.utils/fop/merge.bnd | 2 +- repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd | 2 +- repackage/org.argeo.tp.utils/tika/merge.bnd | 2 +- repackage/org.argeo.tp/jackson/common.bnd | 2 +- repackage/org.argeo.tp/org.apache.commons.fileupload.bnd | 2 +- .../org.argeo.tp/org.apache.httpcomponents.httpclient.bnd | 2 +- .../org.argeo.tp/org.apache.httpcomponents.httpcore.bnd | 2 +- .../org.argeo.tp/org.apache.httpcomponents.httpmime.bnd | 2 +- repackage/org.argeo.tp/org.eclipse.jgit.bnd | 2 +- repackage/org.argeo.tp/xmlgraphics/merge.bnd | 2 +- repackage/uris.properties | 8 ++++---- sdk/argeo-build | 2 +- 30 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 8327b9b..d343bbf 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ distribution: bootstrap bootstrap : mkdir -p $(SDK_BUILD_BASE)/bootstrap - wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.29.0/ecj-3.29.0.jar - wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.28/slf4j-api-1.7.28.jar + wget -c -O $(BOOTSTRAP_BASE)/ecj.jar https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.32.0/ecj-3.32.0.jar + wget -c -O $(BOOTSTRAP_BASE)/slf4j-api.jar https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar wget -c -O $(BOOTSTRAP_BASE)/bndlib.jar https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.3.0/biz.aQute.bndlib-5.3.0.jar clean: diff --git a/repackage/eclipse.mirrors.txt b/repackage/eclipse.mirrors.txt index 652708c..c5517a2 100644 --- a/repackage/eclipse.mirrors.txt +++ b/repackage/eclipse.mirrors.txt @@ -1,3 +1,3 @@ -http://ftp-stud.hs-esslingen.de/Mirrors/eclipse -http://ftp.fau.de/eclipse +https://ftp-stud.hs-esslingen.de/Mirrors/eclipse +https://ftp.fau.de/eclipse https://mirror.dogado.de/eclipse \ No newline at end of file diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd index d73cbb3..c1f0cb2 100644 --- a/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd +++ b/repackage/org.argeo.tp.crypto/apache-sshd/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.9.1 \ No newline at end of file +SLC-Origin-M2: :2.9.2 \ No newline at end of file diff --git a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd b/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd index 0af7209..4706cd2 100644 --- a/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd +++ b/repackage/org.argeo.tp.crypto/apache-sshd/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.sshd -SLC-Origin-M2: :2.9.1 +SLC-Origin-M2: :2.9.2 Export-Package: org.apache.* Import-Package: \ org.apache.tomcat.jni.*;resolution:=optional,\ diff --git a/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd b/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd index dafe848..597634c 100644 --- a/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd +++ b/repackage/org.argeo.tp.crypto/org.apache.tomcat.jni.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 # Use Tomcat v9 to stay compatible with JNI library v1.2 provided by Debian 11 -SLC-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.68 \ No newline at end of file +SLC-Origin-M2: org.apache.tomcat:tomcat-jni:9.0.72 \ No newline at end of file diff --git a/repackage/org.argeo.tp.gis/ejml/merge.bnd b/repackage/org.argeo.tp.gis/ejml/merge.bnd index 6aaf0ee..81a9b01 100644 --- a/repackage/org.argeo.tp.gis/ejml/merge.bnd +++ b/repackage/org.argeo.tp.gis/ejml/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.ejml Bundle-License: Apache-2.0 -SLC-Origin-M2: :0.41 +SLC-Origin-M2: :0.42 Export-Package: org.ejml.* SLC-Origin-M2-Merge: \ org.ejml:ejml-core, \ diff --git a/repackage/org.argeo.tp.gis/geotools/merge.bnd b/repackage/org.argeo.tp.gis/geotools/merge.bnd index 77156e1..e8f8a29 100644 --- a/repackage/org.argeo.tp.gis/geotools/merge.bnd +++ b/repackage/org.argeo.tp.gis/geotools/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: LGPL-2.1-only Bundle-SymbolicName: org.geotools -SLC-Origin-M2: :27.2 +SLC-Origin-M2: :27.4 SLC-Origin-M2-Repo: https://repo.osgeo.org/repository/release/ Export-Package: org.geotools.*, org.opengis.*, net.opengis.*, org.w3.xlink.* Import-Package: \ diff --git a/repackage/org.argeo.tp.gis/h2gis/common.bnd b/repackage/org.argeo.tp.gis/h2gis/common.bnd index 52b4af1..48274ef 100644 --- a/repackage/org.argeo.tp.gis/h2gis/common.bnd +++ b/repackage/org.argeo.tp.gis/h2gis/common.bnd @@ -1,2 +1,2 @@ Bundle-License: LGPL-3.0-or-later -SLC-Origin-M2: :2.1.0 +SLC-Origin-M2: :2.2.0 diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd index 5d259b2..8f269b3 100644 --- a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd +++ b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.20.6 \ No newline at end of file +SLC-Origin-M2: :2.20.8 \ No newline at end of file diff --git a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd index abaada7..a587620 100644 --- a/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd +++ b/repackage/org.argeo.tp.jetty/jetty-websocket/merge.bnd @@ -1,6 +1,6 @@ Bundle-SymbolicName: org.eclipse.jetty.websocket Bundle-License: Apache-2.0 -SLC-Origin-M2: :10.0.12 +SLC-Origin-M2: :10.0.14 SLC-Origin-M2-Merge: \ org.eclipse.jetty.websocket:websocket-core-client, \ org.eclipse.jetty.websocket:websocket-core-common, \ diff --git a/repackage/org.argeo.tp.jetty/jetty/common.bnd b/repackage/org.argeo.tp.jetty/jetty/common.bnd index 27fd8a9..910426a 100644 --- a/repackage/org.argeo.tp.jetty/jetty/common.bnd +++ b/repackage/org.argeo.tp.jetty/jetty/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :10.0.12 +SLC-Origin-M2: :10.0.14 diff --git a/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd index 028a094..cda9231 100644 --- a/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd +++ b/repackage/org.argeo.tp.poi/com.healthmarketscience.jackcess.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.4 \ No newline at end of file +SLC-Origin-M2: com.healthmarketscience.jackcess:jackcess:4.0.5 \ No newline at end of file diff --git a/repackage/org.argeo.tp.poi/log4j/common.bnd b/repackage/org.argeo.tp.poi/log4j/common.bnd index f9e517b..6f8c6d1 100644 --- a/repackage/org.argeo.tp.poi/log4j/common.bnd +++ b/repackage/org.argeo.tp.poi/log4j/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.19.0 +SLC-Origin-M2: :2.20.0 diff --git a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd b/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd index 70b5ac0..a6efcf8 100644 --- a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd +++ b/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd @@ -1,4 +1,4 @@ Bundle-License: EPL-2.0 -SLC-Origin-M2: org.eclipse.jdt:ecj:3.31.0 +SLC-Origin-M2: org.eclipse.jdt:ecj:3.32.0 SLC-Origin-ManifestNotModified: true Main-Class: org.eclipse.jdt.internal.compiler.batch.Main \ No newline at end of file diff --git a/repackage/org.argeo.tp.sql/org.postgresql.bnd b/repackage/org.argeo.tp.sql/org.postgresql.bnd index 6e68b97..c9dad56 100644 --- a/repackage/org.argeo.tp.sql/org.postgresql.bnd +++ b/repackage/org.argeo.tp.sql/org.postgresql.bnd @@ -1,5 +1,5 @@ Bundle-License: BSD-2-Clause -SLC-Origin-M2: org.postgresql:postgresql:42.5.0 +SLC-Origin-M2: org.postgresql:postgresql:42.5.4 Import-Package:\ org.osgi.service.jdbc;resolution:="optional",\ com.sun.jna.*;resolution:="optional",\ diff --git a/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd b/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd index 395c233..ed8d5eb 100644 --- a/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd +++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.biweekly.bnd @@ -1,3 +1,3 @@ Bundle-License: BSD-2-Clause Bundle-SymbolicName: com.github.mangstadt.beweekly -SLC-Origin-M2: net.sf.biweekly:biweekly:0.6.6 \ No newline at end of file +SLC-Origin-M2: net.sf.biweekly:biweekly:0.6.7 \ No newline at end of file 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 8aa1e6e..22aed99 100644 --- a/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd +++ b/repackage/org.argeo.tp.utils/com.github.mangstadt.ezvcard.bnd @@ -1,6 +1,6 @@ Bundle-License: BSD-2-Clause Bundle-SymbolicName: com.github.mangstadt.ezvcard -SLC-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.11.3 +SLC-Origin-M2: com.googlecode.ez-vcard:ez-vcard:0.12.0 Import-Package: \ freemarker.*;resolution:="optional", \ com.fasterxml.jackson.*;resolution:="optional", \ diff --git a/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd b/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd index 08f2139..7b6f43d 100644 --- a/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd +++ b/repackage/org.argeo.tp.utils/de.rototor.pdfbox.graphics2d.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: de.rototor.pdfbox.graphics2d -SLC-Origin-M2: de.rototor.pdfbox:graphics2d:0.41 +SLC-Origin-M2: de.rototor.pdfbox:graphics2d:0.42 diff --git a/repackage/org.argeo.tp.utils/fop/merge.bnd b/repackage/org.argeo.tp.utils/fop/merge.bnd index b8f6548..85b9878 100644 --- a/repackage/org.argeo.tp.utils/fop/merge.bnd +++ b/repackage/org.argeo.tp.utils/fop/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.fop -SLC-Origin-M2: :2.7 +SLC-Origin-M2: :2.8 SLC-Origin-M2-Merge: \ org.apache.xmlgraphics:fop-core,\ org.apache.xmlgraphics:fop-util,\ diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd index 94f8301..08e9034 100644 --- a/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd +++ b/repackage/org.argeo.tp.utils/org.apache.commons.csv.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.commons.csv -SLC-Origin-M2: org.apache.commons:commons-csv:1.9.0 +SLC-Origin-M2: org.apache.commons:commons-csv:1.10.0 diff --git a/repackage/org.argeo.tp.utils/tika/merge.bnd b/repackage/org.argeo.tp.utils/tika/merge.bnd index 7a5b16f..192360f 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 Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.5.0 +SLC-Origin-M2: :2.7.0 Export-Package: org.apache.* Import-Package: *;resolution:=optional SLC-Origin-M2-Merge: \ diff --git a/repackage/org.argeo.tp/jackson/common.bnd b/repackage/org.argeo.tp/jackson/common.bnd index a738fc4..4a3cb68 100644 --- a/repackage/org.argeo.tp/jackson/common.bnd +++ b/repackage/org.argeo.tp/jackson/common.bnd @@ -1,2 +1,2 @@ Bundle-License: Apache-2.0 -SLC-Origin-M2: :2.13.4 +SLC-Origin-M2: :2.14.2 diff --git a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd b/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd index 73b19d4..69bc672 100644 --- a/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd +++ b/repackage/org.argeo.tp/org.apache.commons.fileupload.bnd @@ -3,4 +3,4 @@ Import-Package:\ javax.portlet;resolution:=optional,\ javax.servlet.*;resolution:=optional,\ * -SLC-Origin-M2: commons-fileupload:commons-fileupload:1.4 +SLC-Origin-M2: commons-fileupload:commons-fileupload:1.5 diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd index eead3b2..8f5e09a 100644 --- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd +++ b/repackage/org.argeo.tp/org.apache.httpcomponents.httpclient.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.httpcomponents.httpclient -SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.13 \ No newline at end of file +SLC-Origin-M2: org.apache.httpcomponents:httpclient:4.5.14 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd index b0d0c7a..e00fedd 100644 --- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd +++ b/repackage/org.argeo.tp/org.apache.httpcomponents.httpcore.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.httpcomponents.httpcore -SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.15 \ No newline at end of file +SLC-Origin-M2: org.apache.httpcomponents:httpcore:4.4.16 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd b/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd index 1623fb5..a90bfe7 100644 --- a/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd +++ b/repackage/org.argeo.tp/org.apache.httpcomponents.httpmime.bnd @@ -1,3 +1,3 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.httpcomponents.httpmime -SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.13 \ No newline at end of file +SLC-Origin-M2: org.apache.httpcomponents:httpmime:4.5.14 \ No newline at end of file diff --git a/repackage/org.argeo.tp/org.eclipse.jgit.bnd b/repackage/org.argeo.tp/org.eclipse.jgit.bnd index 65d1344..51c047b 100644 --- a/repackage/org.argeo.tp/org.eclipse.jgit.bnd +++ b/repackage/org.argeo.tp/org.eclipse.jgit.bnd @@ -1,5 +1,5 @@ Bundle-License: BSD-3-Clause -SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.3.0.202209071007-r +SLC-Origin-M2: org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r Import-Package: \ sun.*;resolution:=optional, \ com.jcraft.jsch;resolution:=optional, \ diff --git a/repackage/org.argeo.tp/xmlgraphics/merge.bnd b/repackage/org.argeo.tp/xmlgraphics/merge.bnd index 8cb1d14..ebaaff1 100644 --- a/repackage/org.argeo.tp/xmlgraphics/merge.bnd +++ b/repackage/org.argeo.tp/xmlgraphics/merge.bnd @@ -1,6 +1,6 @@ Bundle-License: Apache-2.0 Bundle-SymbolicName: org.apache.xmlgraphics -SLC-Origin-M2: :2.7 +SLC-Origin-M2: :2.8 SLC-Origin-M2-Merge: \ org.apache.xmlgraphics:xmlgraphics-commons Export-Package: org.apache.xmlgraphics.* diff --git a/repackage/uris.properties b/repackage/uris.properties index 61c3358..be6f001 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,4 +1,4 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.25-202208311800/equinox-SDK-4.25.zip -eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.25-202208311800/org.eclipse.platform.source-4.25.zip -eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.22/e4/rap-e4-3.22.0-R-20220906-0913.zip -eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/2.7.1/repository-nebula-2.7.1.zip \ No newline at end of file +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.26-202211231800/equinox-SDK-4.26.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.26-202211231800/org.eclipse.platform.source-4.26.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.23/e4/rap-e4-3.23.0-R-20221130-0716.zip +eclipse-nebula=http://www.eclipse.org/downloads/nebula/releases/2.7.2/repository-nebula-latest.zip \ No newline at end of file diff --git a/sdk/argeo-build b/sdk/argeo-build index ca2d551..642b596 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit ca2d551c67515082032aad2405f30a924468089a +Subproject commit 642b596b52a99d492cc818589c6d63cf713a33bf -- 2.30.2