From 3b594b344d641fff90d0701a8b3cfc73c03df051 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Tue, 14 Jan 2025 20:06:54 -0800
Subject: [PATCH 1/2] Removed ssl features from 3.15.3 repo

---
 .../feature.xml                               | 10 +----
 pom.xml                                       |  5 ---
 .../org.eclipse.core.resources.prefs          |  2 +
 .../org.eclipse.ecf.base.feature/feature.xml  | 38 +++----------------
 .../feature.xml                               | 10 +----
 .../features/org.eclipse.ecf.sdk/feature.xml  |  8 ----
 .../feature.xml                               | 18 +--------
 .../pom.xml                                   |  2 +-
 8 files changed, 11 insertions(+), 82 deletions(-)
 create mode 100644 providers/bundles/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.core.resources.prefs

diff --git a/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml b/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
index 2008adf054..4b247ff83e 100644
--- a/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
+++ b/examples/bundles/org.eclipse.ecf.example.twitter.client/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.twitter.feature"
       label="Feature"
-      version="1.0.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Pierre">
 
    <description url="http://www.example.com/description">
@@ -749,14 +749,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.security"
          download-size="0"
diff --git a/pom.xml b/pom.xml
index b1d1b97f34..822ecce3c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,6 @@
     <module>framework/bundles/org.eclipse.ecf.remoteservice.servlet</module>
     <module>framework/bundles/org.eclipse.ecf.remoteservice.ui</module>
     <module>framework/bundles/org.eclipse.ecf.sharedobject</module>
-    <module>framework/bundles/org.eclipse.ecf.ssl</module>
     <module>framework/bundles/org.eclipse.ecf.ui.capabilities</module>
     <module>framework/bundles/org.eclipse.ecf.ui</module>
     <module>framework/bundles/org.eclipse.team.ecf.core</module>
@@ -144,7 +143,6 @@
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer</module>
-    <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl</module>
     <module>providers/bundles/org.eclipse.ecf.provider.irc</module>
     <module>providers/bundles/org.eclipse.ecf.provider.irc.ui</module>
     <module>providers/bundles/org.eclipse.ecf.provider.jmdns</module>
@@ -172,7 +170,6 @@
     <module>tests/bundles/org.eclipse.ecf.tests.provider.xmpp</module>
     <module>tests/bundles/org.eclipse.ecf.tests.remoteservice</module>
     <module>tests/bundles/org.eclipse.ecf.tests.sharedobject</module>
-    <module>tests/bundles/org.eclipse.ecf.tests.ssl</module>
     <module>tests/bundles/org.eclipse.ecf.tests.osgi.services.distribution</module>
     <module>tests/bundles/org.eclipse.ecf.tests.discovery</module>
     <module>tests/bundles/org.eclipse.ecf.tests.remoteservice.generic</module>
@@ -186,7 +183,6 @@
     <module>releng/features/org.eclipse.ecf.console.feature</module>
     <module>releng/features/org.eclipse.ecf.core</module>
     <module>releng/features/org.eclipse.ecf.core.feature</module>
-    <module>releng/features/org.eclipse.ecf.core.ssl.feature</module>
     <module>releng/features/org.eclipse.ecf.datashare.feature</module>
     <module>releng/features/org.eclipse.ecf.discovery.dnssd.feature</module>
     <module>releng/features/org.eclipse.ecf.discovery.feature</module>
@@ -196,7 +192,6 @@
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature</module>
-    <module>releng/features/org.eclipse.ecf.filetransfer.ssl.feature</module>
     <module>releng/features/org.eclipse.ecf.osgi.services.feature</module>
     <module>releng/features/org.eclipse.ecf.presence.feature</module>
     <module>releng/features/org.eclipse.ecf.provider.generic.datashare.feature</module>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.core.resources.prefs b/providers/bundles/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..68a0304527
--- /dev/null
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=windows-1252
diff --git a/releng/features/org.eclipse.ecf.base.feature/feature.xml b/releng/features/org.eclipse.ecf.base.feature/feature.xml
index c103507ceb..af25fa7383 100644
--- a/releng/features/org.eclipse.ecf.base.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.base.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.base.feature"
       label="ECF Base Feature"
-      version="2.2.0.qualifier"
+      version="3.0.0.qualifier"
       provider-name="Eclipse.org"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -21,46 +21,18 @@
 
    <plugin
          id="org.eclipse.ecf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ecf.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ecf.identity"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.ecf.provider.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/releng/features/org.eclipse.ecf.filetransfer.p2.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.p2.feature/feature.xml
index 15a5cd1b32..e9e9d39123 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.p2.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.p2.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.filetransfer.p2.feature"
       label="ECF P2 FileTransfer"
-      version="1.0.301.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -19,18 +19,10 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.ecf.core.ssl.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.ecf.filetransfer.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.ecf.filetransfer.ssl.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.ecf.filetransfer.httpclient4.feature"
          version="0.0.0"/>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
index c51eecfe19..f9841edb6c 100644
--- a/releng/features/org.eclipse.ecf.sdk/feature.xml
+++ b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -31,14 +31,6 @@
          id="org.eclipse.ecf.core.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.ecf.core.ssl.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.ecf.filetransfer.ssl.feature"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.ecf.filetransfer.feature"
          version="0.0.0"/>
diff --git a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml
index 78db68ae5f..ecec347cbf 100644
--- a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.tests.filetransfer.feature"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -37,22 +37,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ecf.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.ecf.tests.filetransfer.httpclient5"
          download-size="0"
diff --git a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml
index 659ccbdaca..651e77e465 100644
--- a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   
   <artifactId>org.eclipse.ecf.tests.filetransfer.feature</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>

From d894d931443699f1fa71f6a2a393d397d1216b36 Mon Sep 17 00:00:00 2001
From: Scott Lewis <scottslewis@gmail.com>
Date: Tue, 14 Jan 2025 20:13:55 -0800
Subject: [PATCH 2/2] Removed old ECF feature categories

---
 .../org.eclipse.ecf.doc/tocjavadoc.xml        |  1 -
 .../category.xml                              | 44 -------------------
 2 files changed, 45 deletions(-)

diff --git a/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml b/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
index 3a43075ea7..02f9ef1702 100644
--- a/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
@@ -37,7 +37,6 @@
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/events/socket/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.events.socket"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient45/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient5/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclientjava/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclientjava"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/identity/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.identity"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/outgoing/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.outgoing"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/retrieve/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.retrieve"/>
diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
index f79ae1d62a..b8016e49df 100644
--- a/releng/org.eclipse.ecf.releng.repository/category.xml
+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -1,47 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.ecf.core.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.core.ssl.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0">
-      <category name="core"/>
-   </feature>
-   <feature id="org.eclipse.ecf.core.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.core.ssl.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
-   <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" version="0.0.0">
-      <category name="core sources"/>
-   </feature>
    <feature id="org.eclipse.ecf.remoteservice.sdk.feature" version="0.0.0">
       <category name="sdk.osgi"/>
    </feature>
@@ -111,8 +69,6 @@
    <feature id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature.source">
       <category name="sdk.bndtools"/>
    </feature>
-   <category-def name="core" label="ECF Core Features"/>
-   <category-def name="core sources" label="ECF Core Source Features"/>
    <category-def name="remoteservices" label="ECF Remote Services SDKs"/>
    <category-def name="other" label="Other ECF Features"/>
    <category-def name="sdk.osgi" label="SDK for OSGi-based Clients and Servers (e.g. Apache Karaf)">