Ensure that both ECF providers work and that the old one is the default

#46
eclipse-oomph · Nov 13, 2023 · c981e3e · c981e3e
1 parent 2d7f8ce
commit c981e3e
Show file tree

Hide file tree

Showing 7 changed files with 367 additions and 63 deletions.
diff --git a/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
@@ -36,7 +36,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.24.0,4.0.0)",
  org.eclipse.oomph.setup.p2;bundle-version="[1.20.0,2.0.0)",
  org.eclipse.oomph.preferences;bundle-version="[1.14.0,2.0.0)",
  org.eclipse.core.net;bundle-version="[1.2.0,2.0.0)"
-Import-Package: org.bouncycastle.openpgp;version="[1.65.0,2.0.0)"
+Import-Package: org.apache.hc.client5.http.cookie;version="[5.1.3,6.0.0)",
+ org.apache.hc.client5.http.impl.cookie;version="[5.1.3,6.0.0)",
+ org.bouncycastle.openpgp;version="[1.65.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.oomph.setup.internal.core;version="1.29.0";x-internal:=true,