tweaking the products to use httpclient45 feature

tweaking-the-products-to-use-httpclient45-feature.patch

@@ -0,0 +1,41 @@
+From fc41eb3f0b84a76bcd7e5b17246165f4df02edd6 Mon Sep 17 00:00:00 2001
+From: chen-jan <chen_aka_jan@163.com>
+Date: Fri, 6 May 2022 08:20:09 +0000
+Subject: [PATCH] tweaking the products to use httpclient45 feature
+
+---
+ .../tycho-bundles-external/tycho-bundles-external.product      | 3 +--
+ tycho-bundles/tycho-standalone-p2-director/p2 Director.product | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+index 182122d..57c1213 100644
+--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
++++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+@@ -37,8 +37,7 @@
+       <plugin id="org.eclipse.ecf.filetransfer"/>
+       <plugin id="org.eclipse.ecf.identity"/>
+       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
+-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
+-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl" fragment="true"/>
++      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
+       <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
+       <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
+       <plugin id="org.eclipse.equinox.app"/>
+diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
+index 9cf5ed2..78f9b25 100644
+--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product	
++++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product	
+@@ -37,8 +37,7 @@
+       <plugin id="org.eclipse.ecf.filetransfer"/>
+       <plugin id="org.eclipse.ecf.identity"/>
+       <plugin id="org.eclipse.ecf.provider.filetransfer"/>
+-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
+-      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl" fragment="true"/>
++      <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
+       <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
+       <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
+       <plugin id="org.eclipse.equinox.app"/>
+-- 
+2.30.0
+

tycho.spec

@@ -8,7 +8,7 @@
 %define __requires_exclude osgi*
 Name:                tycho
 Version:             1.3.0
-Release:             3
+Release:             4
 Summary:             Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 License:             ASL 2.0 and EPL-1.0
 URL:                 http://eclipse.org/tycho
@@ -30,6 +30,8 @@ Patch2:              0003-Port-to-latest-versio-of-Mockito.patch
 Patch3:              0004-Implement-a-custom-resolver-for-Tycho-in-local-mode.patch
 Patch4:              0005-Fix-build-fail.patch
 Patch5:              0006-Tycho-should-always-delegate-artifact-resolution-to-.patch
+#Patch from: https://git.eclipse.org/c/tycho/org.eclipse.tychogit/commit/?id=43a0e167e39ffaafa5c0e70fbc0ea0b87828f1b3
+Patch6:              tweaking-the-products-to-use-httpclient45-feature.patch
 # Upstream Eclipse no longer supports non-64bit arches
 ExcludeArch:         s390 %{arm} %{ix86}
 BuildArch:           noarch
@@ -115,6 +117,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %pom_remove_plugin :maven-site-plugin
 %if %{without junit5}
 %pom_disable_module org.eclipse.tycho.surefire.junit5 tycho-surefire
@@ -255,6 +258,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri May 06 2022 chenchen <chen_aka_jan@163.com> - 1.3.0-4
+- tweaking the products to use httpclient45 feature
+
 * Sun Sep 13 2020 yanan li <liyanan032@huawei.com> - 1.3.0-3
 - fix build fail