From cac139764636dbc53a2ce0d22dabcb0e8e73c4bd Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 22 Mar 2023 10:01:59 +0100 Subject: [PATCH] Update third party versions to latest --- .../bouncycastle/org.bouncycastle.pg.bnd | 2 +- repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd | 2 +- .../org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd | 2 +- repackage/org.argeo.tp.gis/org.cts.bnd | 4 ++-- repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd | 1 + repackage/org.argeo.tp.jcr/jackrabbit/common.bnd | 2 +- repackage/org.argeo.tp.jcr/oak/common.bnd | 2 +- repackage/org.argeo.tp.utils/javax.el.bnd | 3 +++ repackage/org.argeo.tp.utils/javax.xml.bind.bnd | 3 ++- .../org.argeo.tp.utils/org.apache.commons.beanutils.bnd | 2 ++ .../org.apache.commons.collections.bnd | 0 .../org.argeo.tp.utils/org.apache.commons.jxpath.bnd | 6 ++++++ repackage/org.argeo.tp/javax.servlet.bnd | 2 +- repackage/org.argeo.tp/javax.servlet.jsp.bnd | 3 +++ repackage/org.argeo.tp/{com.h2database.bnd => org.h2.bnd} | 1 + .../eclipse-rap/includes.properties | 1 - .../eclipse-rcp/includes.properties | 1 - repackage/uris.properties | 8 ++++---- sdk/argeo-build | 2 +- 19 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 repackage/org.argeo.tp.utils/javax.el.bnd create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd rename repackage/{org.argeo.tp.jcr => org.argeo.tp.utils}/org.apache.commons.collections.bnd (100%) create mode 100644 repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd create mode 100644 repackage/org.argeo.tp/javax.servlet.jsp.bnd rename repackage/org.argeo.tp/{com.h2database.bnd => org.h2.bnd} (99%) diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd index bf6e635..70b7352 100644 --- a/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd +++ b/repackage/org.argeo.tp.crypto/bouncycastle/org.bouncycastle.pg.bnd @@ -1,2 +1,2 @@ Argeo-Origin-NoMetadataGeneration: true -Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on +Argeo-Origin-M2: org.bouncycastle:bcpg-jdk18on:1.72.2 diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd index 0372e66..0febb55 100644 --- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.bnd @@ -1,2 +1,2 @@ Argeo-Origin-M2: org.orbisgis:h2gis -Fragment-Host: com.h2database \ No newline at end of file +Fragment-Host: org.h2 diff --git a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd index b23aad3..4f6db00 100644 --- a/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd +++ b/repackage/org.argeo.tp.gis/h2gis/org.h2gis.postgis_jts.bnd @@ -1,2 +1,2 @@ Argeo-Origin-M2: org.orbisgis:postgis-jts -Fragment-Host: com.h2database \ No newline at end of file +Fragment-Host: org.h2 diff --git a/repackage/org.argeo.tp.gis/org.cts.bnd b/repackage/org.argeo.tp.gis/org.cts.bnd index 9bc1707..ec4c2c1 100644 --- a/repackage/org.argeo.tp.gis/org.cts.bnd +++ b/repackage/org.argeo.tp.gis/org.cts.bnd @@ -1,3 +1,3 @@ SPDX-License-Identifier: LGPL-3.0-or-later -Argeo-Origin-M2: org.orbisgis:cts:1.6.0 -# 1.6.0 sources are missing in Maven central +Argeo-Origin-M2: org.orbisgis:cts:1.7.0 +# TODO: 1.7.0 sources are missing in Maven central diff --git a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd index 97b516e..fe983a8 100644 --- a/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd +++ b/repackage/org.argeo.tp.gis/org.locationtech.spatial4j.bnd @@ -1,5 +1,6 @@ SPDX-License-Identifier: Apache-2.0 Argeo-Origin-M2: org.locationtech.spatial4j:spatial4j:0.8 + Import-Package:\ org.noggit;resolution:="optional",\ * \ No newline at end of file diff --git a/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd b/repackage/org.argeo.tp.jcr/jackrabbit/common.bnd index d9b4b16..0e41b93 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.8 \ No newline at end of file +Argeo-Origin-M2: :2.20.9 \ 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 d011c6f..8a2ba95 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.44.0 \ No newline at end of file +Argeo-Origin-M2: :1.48.0 \ No newline at end of file diff --git a/repackage/org.argeo.tp.utils/javax.el.bnd b/repackage/org.argeo.tp.utils/javax.el.bnd new file mode 100644 index 0000000..caf57c0 --- /dev/null +++ b/repackage/org.argeo.tp.utils/javax.el.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1 +# TODO: find a way to retrieve a more recent version (e.g. v3.0.4), or to rebuild it +Argeo-Origin-M2: javax.el:javax.el-api:3.0.0 diff --git a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd index 07a78ce..37afe39 100644 --- a/repackage/org.argeo.tp.utils/javax.xml.bind.bnd +++ b/repackage/org.argeo.tp.utils/javax.xml.bind.bnd @@ -1,6 +1,7 @@ SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.0 -Bundle-Version: 2.4.0 Argeo-Origin-M2: javax.xml.bind:jaxb-api:2.4.0-b180830.0359 +Bundle-Version: 2.4.0.b1808300359 + Import-Package: \ org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\ * diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd new file mode 100644 index 0000000..5d6aa32 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.beanutils.bnd @@ -0,0 +1,2 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: commons-beanutils:commons-beanutils:1.9.4 diff --git a/repackage/org.argeo.tp.jcr/org.apache.commons.collections.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.collections.bnd similarity index 100% rename from repackage/org.argeo.tp.jcr/org.apache.commons.collections.bnd rename to repackage/org.argeo.tp.utils/org.apache.commons.collections.bnd diff --git a/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd b/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd new file mode 100644 index 0000000..58cf352 --- /dev/null +++ b/repackage/org.argeo.tp.utils/org.apache.commons.jxpath.bnd @@ -0,0 +1,6 @@ +SPDX-License-Identifier: Apache-2.0 +Argeo-Origin-M2: commons-jxpath:commons-jxpath:1.3 + +Import-Package: \ +org.jdom.*;resolution:="optional", \ +* \ No newline at end of file diff --git a/repackage/org.argeo.tp/javax.servlet.bnd b/repackage/org.argeo.tp/javax.servlet.bnd index 745e373..4201c14 100644 --- a/repackage/org.argeo.tp/javax.servlet.bnd +++ b/repackage/org.argeo.tp/javax.servlet.bnd @@ -1,3 +1,3 @@ -SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0 Argeo-Origin-M2: jakarta.servlet:jakarta.servlet-api:4.0.4 Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/javax.servlet.jsp.bnd b/repackage/org.argeo.tp/javax.servlet.jsp.bnd new file mode 100644 index 0000000..884367b --- /dev/null +++ b/repackage/org.argeo.tp/javax.servlet.jsp.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR CDDL-1.1 +Argeo-Origin-M2: javax.servlet.jsp:javax.servlet.jsp-api:2.3.3 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/org.argeo.tp/com.h2database.bnd b/repackage/org.argeo.tp/org.h2.bnd similarity index 99% rename from repackage/org.argeo.tp/com.h2database.bnd rename to repackage/org.argeo.tp/org.h2.bnd index d108669..9df3bcf 100644 --- a/repackage/org.argeo.tp/com.h2database.bnd +++ b/repackage/org.argeo.tp/org.h2.bnd @@ -1,5 +1,6 @@ SPDX-License-Identifier: MPL-2.0 Argeo-Origin-M2: com.h2database:h2:2.1.214 + Import-Package:\ jakarta.*;resolution:=optional,\ org.apache.lucene.*;resolution:=optional,\ 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 93e66cb..e8e614a 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,6 +1,5 @@ plugins/javax.inject*.jar= plugins/javax.annotation*.jar= -plugins/org.apache.commons.jxpath*.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 2e54d27..a8755e1 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,6 +1,5 @@ plugins/javax.inject*.jar= plugins/javax.annotation*.jar= -plugins/org.apache.commons.jxpath*.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 be6f001..217bef9 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,4 +1,4 @@ -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 +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.27-202303020300/equinox-SDK-4.27.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.27-202303020300/org.eclipse.platform.source-4.27.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.24/e4/rap-e4-3.24.0-R-20230308-0917.zip +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 6c0e011..884c8b0 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 6c0e011bdddc156221a8dfc3bba979446e08deea +Subproject commit 884c8b0c0b76b4d60fcb4a65d48a898f3ba27f0e -- 2.30.2