From 288526e9885c0a09867017e6e83f15ef01cf4879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Mon, 19 Dec 2022 17:03:45 +0100 Subject: [PATCH] Require httpclientjava instead of httpclient5 Fix https://github.com/eclipse-equinox/p2/issues/205 --- bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- features/org.eclipse.equinox.p2.core.feature/feature.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index 81acd4c83d..36c4878ee2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -45,7 +45,7 @@ Require-Bundle: org.eclipse.equinox.frameworkadmin, org.eclipse.ecf.filetransfer;bundle-version="4.0.0", org.eclipse.ecf.identity;bundle-version="3.1.0", org.eclipse.ecf.provider.filetransfer;bundle-version="3.1.0", - org.eclipse.ecf.provider.filetransfer.httpclient5, + org.eclipse.ecf.provider.filetransfer.httpclientjava, org.eclipse.equinox.p2.reconciler.dropins;bundle-version="1.1.0", org.eclipse.ant.core;bundle-version="3.2.200", org.apache.ant;bundle-version="1.7.1", diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF index b3f61a3a78..a1043e6dda 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.discovery/META-INF/MANIFEST.MF @@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.equinox.p2.discovery.compatibility;bundle-version="1.0.0", org.eclipse.equinox.p2.ui.discovery;bundle-version="1.0.0", org.apache.httpcomponents.client5.httpclient5;bundle-version="5.0.2", - org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0" + org.eclipse.ecf.provider.filetransfer.httpclientjava;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.equinox.p2.examples.rcp.cloud diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/META-INF/MANIFEST.MF index 432a261add..51ad8fcd23 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.prestartupdate/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ecf.identity;bundle-version="3.0.0", org.eclipse.ecf.provider.filetransfer;bundle-version="3.0.0", org.apache.httpcomponents.client5.httpclient5;bundle-version="5.0.2", - org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0" + org.eclipse.ecf.provider.filetransfer.httpclientjava;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.equinox.p2.examples.rcp.prestartupdate diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF index f33523a15a..6af5e60b5c 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.ecf.identity;bundle-version="3.0.0", org.eclipse.ecf.provider.filetransfer;bundle-version="3.0.0", org.apache.httpcomponents.client5.httpclient5;bundle-version="5.0.2", - org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0" + org.eclipse.ecf.provider.filetransfer.httpclientjava;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Service-Component: OSGI-INF/policy_component.xml diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF index d8d3bc4509..8817317628 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ecf.identity;bundle-version="3.0.0", org.eclipse.ecf.provider.filetransfer;bundle-version="3.0.0", org.apache.httpcomponents.client5.httpclient5;bundle-version="5.0.2", - org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0", + org.eclipse.ecf.provider.filetransfer.httpclientjava;bundle-version="1.0.0", org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF index aaa87235f5..f6f1f24c06 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.0", org.eclipse.equinox.p2.ui.sdk.scheduler;bundle-version="1.0.0", org.apache.httpcomponents.client5.httpclient5;bundle-version="5.0.2", - org.eclipse.ecf.provider.filetransfer.httpclient5;bundle-version="1.0.0" + org.eclipse.ecf.provider.filetransfer.httpclientjava;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.equinox.p2.examples.rcp.sdkui diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml index 5d12b61f9a..29520f2e1a 100644 --- a/features/org.eclipse.equinox.p2.core.feature/feature.xml +++ b/features/org.eclipse.equinox.p2.core.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - +