From 450b3f463b8adf5a485184581efa391d5a8bc49c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 10 Apr 2024 07:43:34 +0200 Subject: [PATCH] Update Eclipse and Equinox --- repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd | 2 +- repackage/org.argeo.tp.httpd/jetty/common.bnd | 2 +- .../org.eclipse.equinox.http.service.api.bnd | 3 +++ .../org.osgi.service.http.whiteboard.bnd | 3 +++ repackage/uris.properties | 6 +++--- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 repackage/osgi/equinox/org.argeo.tp.eclipse/org.eclipse.equinox.http.service.api.bnd create mode 100644 repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.http.whiteboard.bnd diff --git a/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd b/repackage/org.argeo.tp.httpd/jetty-websocket/merge.bnd index d822338..4bbcbe2 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: :12.0.4 +Argeo-Origin-M2: :12.0.7 # TODO split ee8 and ee10 ? Argeo-Origin-M2-Merge: \ org.eclipse.jetty.websocket:jetty-websocket-core-client, \ diff --git a/repackage/org.argeo.tp.httpd/jetty/common.bnd b/repackage/org.argeo.tp.httpd/jetty/common.bnd index 262ef7f..33b0c1c 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: :12.0.4 +Argeo-Origin-M2: :12.0.7 diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/org.eclipse.equinox.http.service.api.bnd b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.eclipse.equinox.http.service.api.bnd new file mode 100644 index 0000000..ac37a92 --- /dev/null +++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.eclipse.equinox.http.service.api.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: EPL-2.0 +Argeo-Origin-M2: org.eclipse.platform:org.eclipse.equinox.http.service.api:1.2.2 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.http.whiteboard.bnd b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.http.whiteboard.bnd new file mode 100644 index 0000000..ebcd85e --- /dev/null +++ b/repackage/osgi/equinox/org.argeo.tp.eclipse/org.osgi.service.http.whiteboard.bnd @@ -0,0 +1,3 @@ +SPDX-License-Identifier: EPL-2.0 +Argeo-Origin-M2: org.osgi:org.osgi.service.http.whiteboard:1.1.1 +Argeo-Origin-NoMetadataGeneration: true diff --git a/repackage/uris.properties b/repackage/uris.properties index 6d71e1d..dc52bb4 100644 --- a/repackage/uris.properties +++ b/repackage/uris.properties @@ -1,5 +1,5 @@ -eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.30-202312010110/equinox-SDK-4.30.zip -eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.30-202312010110/org.eclipse.platform.source-4.30.zip -eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.27/e4/rap-e4-3.27.0-R-20231205-1650.zip +eclipse-equinox=http://www.eclipse.org/downloads/equinox/drops/R-4.31-202402290520/equinox-SDK-4.31.zip +eclipse-rcp=http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-4.31-202402290520/org.eclipse.platform.source-4.31.zip +eclipse-rap=http://www.eclipse.org/downloads/rt/rap/3.28/e4/rap-e4-3.28.0-R-20240306-1417.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 -- 2.30.2