From 00aa69ec7e0d36a850c24d04eff7b5c1233d2cde Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Sun, 5 Jan 2025 10:13:34 +0100
Subject: [PATCH] Remove references to all of ECF's ssl bundles and features

https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2725
---
 features/org.eclipse.equinox.p2.core.feature/feature.xml       | 2 --
 .../cloud.product                                              | 3 ---
 .../prestartupdate.product                                     | 3 ---
 .../sdkbundlevisibility.product                                | 2 --
 .../sdknoautoupdates.product                                   | 3 ---
 .../sdkui.product                                              | 3 ---
 .../org.eclipse.equinox.p2.installer.product/installer.product | 3 ---
 .../org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product    | 3 ---
 8 files changed, 22 deletions(-)

diff --git a/features/org.eclipse.equinox.p2.core.feature/feature.xml b/features/org.eclipse.equinox.p2.core.feature/feature.xml
index 973054bd0..0b3f76e9f 100644
--- a/features/org.eclipse.equinox.p2.core.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.core.feature/feature.xml
@@ -21,11 +21,9 @@
 
    <requires>
       <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.httpclientjava.feature" version="2.0.0" match="compatible"/>
       <import feature="org.eclipse.ecf.filetransfer.httpclient5.feature" version="1.0.0" match="compatible"/>
-      <import feature="org.eclipse.ecf.filetransfer.ssl.feature" version="1.1.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/products/org.eclipse.equinox.p2.examples.rcp.discovery.product/cloud.product b/products/org.eclipse.equinox.p2.examples.rcp.discovery.product/cloud.product
index a0d1c1e82..ab8bba732 100644
--- a/products/org.eclipse.equinox.p2.examples.rcp.discovery.product/cloud.product
+++ b/products/org.eclipse.equinox.p2.examples.rcp.discovery.product/cloud.product
@@ -79,10 +79,7 @@
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.emf.common"/>
       <plugin id="org.eclipse.emf.ecore"/>
       <plugin id="org.eclipse.emf.ecore.change"/>
diff --git a/products/org.eclipse.equinox.p2.examples.rcp.prestartupdate.product/prestartupdate.product b/products/org.eclipse.equinox.p2.examples.rcp.prestartupdate.product/prestartupdate.product
index 7415716ac..510fd23c2 100644
--- a/products/org.eclipse.equinox.p2.examples.rcp.prestartupdate.product/prestartupdate.product
+++ b/products/org.eclipse.equinox.p2.examples.rcp.prestartupdate.product/prestartupdate.product
@@ -51,9 +51,6 @@
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.apache.felix.scr"/>
diff --git a/products/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.product/sdkbundlevisibility.product b/products/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.product/sdkbundlevisibility.product
index 4e49a8726..cd787474e 100644
--- a/products/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.product/sdkbundlevisibility.product
+++ b/products/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.product/sdkbundlevisibility.product
@@ -79,8 +79,6 @@
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclientjava"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.emf.common"/>
       <plugin id="org.eclipse.emf.ecore"/>
       <plugin id="org.eclipse.emf.ecore.change"/>
diff --git a/products/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates.product/sdknoautoupdates.product b/products/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates.product/sdknoautoupdates.product
index 76a27f873..26b1b66b3 100644
--- a/products/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates.product/sdknoautoupdates.product
+++ b/products/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates.product/sdknoautoupdates.product
@@ -50,9 +50,6 @@
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.frameworkadmin"/>
diff --git a/products/org.eclipse.equinox.p2.examples.rcp.sdkui.product/sdkui.product b/products/org.eclipse.equinox.p2.examples.rcp.sdkui.product/sdkui.product
index b5471e7d3..d627a379a 100644
--- a/products/org.eclipse.equinox.p2.examples.rcp.sdkui.product/sdkui.product
+++ b/products/org.eclipse.equinox.p2.examples.rcp.sdkui.product/sdkui.product
@@ -56,9 +56,6 @@
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.apache.felix.scr"/>
diff --git a/products/org.eclipse.equinox.p2.installer.product/installer.product b/products/org.eclipse.equinox.p2.installer.product/installer.product
index 83b557986..10ab222b5 100644
--- a/products/org.eclipse.equinox.p2.installer.product/installer.product
+++ b/products/org.eclipse.equinox.p2.installer.product/installer.product
@@ -48,9 +48,6 @@
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
diff --git a/products/org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product b/products/org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product
index 18b6a8f24..c02b513df 100644
--- a/products/org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product
+++ b/products/org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product
@@ -193,9 +193,6 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
       <plugin id="org.eclipse.ecf.identity"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
       <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
       <plugin id="org.eclipse.emf.common"/>
       <plugin id="org.eclipse.emf.ecore"/>
       <plugin id="org.eclipse.emf.ecore.change"/>