Bug 577769 - Switch to ecf.httpclient5
Change-Id: I61ea91860b1ae786f0b328921b33d82ac42d3c95
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/188772
Tested-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index f945e1a..1796f13 100644
--- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -197,17 +197,17 @@
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
- <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.702.v20210409-2301"/>
- <unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.5.702.v20210409-2301"/>
+ <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.6.1.v20211005-1944"/>
+ <unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.6.1.v20211005-1944"/>
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.501.v20210409-2301"/>
<unit id="org.eclipse.ecf.core.ssl.feature.source.feature.group" version="1.1.501.v20210409-2301"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1800.v20210618-0642"/>
<unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.14.1800.v20210618-0642"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.0.703.v20210512-0614"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.source.feature.group" version="1.0.703.v20210512-0614"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.feature.group" version="1.0.0.v20210512-0614"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient5.feature.source.feature.group" version="1.0.0.v20210512-0614"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.401.v20210409-2301"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.401.v20210409-2301"/>
- <repository location="https://download.eclipse.org/rt/ecf/3.14.22/site.p2/3.14.22.v20210618-0642/"/>
+ <repository location="https://download.eclipse.org/rt/ecf/3.14.26/site.p2/3.14.26.v20211008-2302/"/>
</location>
<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index 38f9964..6a4faf6 100644
--- 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.httpclient45.feature" version="0.0.0"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient45.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.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/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
index 528c9d9..d2de8e6 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
@@ -162,12 +162,12 @@
<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.httpclient45.feature.source"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient5.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.httpclient45.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature"/>
<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
</features>
