Require httpclientjava instead of httpclient5

Fix #205
eclipse-equinox · Jun 8, 2023 · 288526e · 288526e
1 parent ab2268e
commit 288526e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.p2.core.feature"
       label="%featureName"
-      version="1.6.1900.qualifier"
+      version="1.7.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -23,7 +23,7 @@
       <import feature="org.eclipse.ecf.core.feature" version="1.4.0" match="compatible"/>
       <import feature="org.eclipse.ecf.core.ssl.feature" version="1.1.0" match="compatible"/>
       <import feature="org.eclipse.ecf.filetransfer.feature" version="3.13.7" match="compatible"/>
-      <import feature="org.eclipse.ecf.filetransfer.httpclient5.feature" version="1.0.0" match="compatible"/>
+      <import feature="org.eclipse.ecf.filetransfer.httpclientjava.feature" version="1.0.0" match="compatible"/>
       <import feature="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.0" match="compatible"/>
    </requires>