Replace ECF's filetransfer.httpclient5 with filetransfer.httpclientjava

eclipse-equinox/p2#205
eclipse-platform · Sep 23, 2023 · ad99eb6 · ad99eb6
1 parent 51f5c3f
commit ad99eb6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -163,7 +163,7 @@
                   </requirement>
                   <requirement>
                     <type>eclipse-plugin</type>
-                    <id>org.eclipse.ecf.provider.filetransfer.httpclient5</id>
+                    <id>org.eclipse.ecf.provider.filetransfer.httpclientjava</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
                   <requirement>

diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -78,10 +78,6 @@
       <unit id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source.feature.group" version="2.0.0.v20230715-1752"/>
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20230422-0242"/>
       <unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.401.v20230422-0242"/>
-      <!-- ⚠️ Remove httpclient5 when there is no reference left ⚠️ -->
-      <!-- https://github.com/eclipse-equinox/p2/pull/206 -->
-      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.1.701.v20230423-0417"/>
-      <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.source.feature.group" version="1.1.701.v20230423-0417"/>
       <!-- ⚠️ TODO Use a release repo for 3.14.40 before releaseing Platform ⚠️ -->
       <repository location="https://download.eclipse.org/rt/ecf/snapshot/site.p2/3.14.40.v20230905-1933/"/>
     </location>

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -36,8 +36,8 @@
    <feature id="org.eclipse.ecf.core.ssl.feature.source" version="0.0.0"/>
    <feature id="org.eclipse.ecf.filetransfer.feature" version="0.0.0"/>
    <feature id="org.eclipse.ecf.filetransfer.feature.source" version="0.0.0"/>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" version="0.0.0"/>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature.source" version="0.0.0"/>
+   <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" version="0.0.0"/>
+   <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source" version="0.0.0"/>
    <feature id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0"/>
    <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" version="0.0.0"/>
    <bundle id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list_external.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/apiexclude/exclude_list_external.txt
@@ -5,8 +5,6 @@
 ## NON-ECLIPSE BUNDLES
 org.apache.ant
 org.apache.commons.codec
-org.apache.httpcomponents.httpclient
-org.apache.httpcomponents.httpcore
 org.objectweb.asm
 
 ## SPECIAL CASE FOR SWT: THE FRAGMENT IS ANALYZED AS PART OF THE HOST

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
@@ -162,12 +162,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.ecf.core.feature.source"/>
       <feature id="org.eclipse.ecf.core.ssl.feature.source"/>
       <feature id="org.eclipse.ecf.filetransfer.feature.source"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature.source"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source"/>
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source"/>
       <feature id="org.eclipse.ecf.core.feature"/>
       <feature id="org.eclipse.ecf.core.ssl.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
    </features>
 

diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
@@ -72,7 +72,7 @@
       <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
       <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
       <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
-      <import feature="org.eclipse.ecf.filetransfer.httpclient5.feature.source" version="1.0.0" match="compatible"/>
+      <import feature="org.eclipse.ecf.filetransfer.httpclientjava.feature.source" version="2.0.0" match="compatible"/>
       <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
    </requires>