|
|
|
|
@ -1,36 +1,41 @@
|
|
|
|
|
%bcond_with bootstrap
|
|
|
|
|
%bcond_without memcached
|
|
|
|
|
%bcond_without ehcache
|
|
|
|
|
|
|
|
|
|
Name: httpcomponents-client
|
|
|
|
|
Summary: HTTP agent implementation based on httpcomponents HttpCore
|
|
|
|
|
Version: 4.5.13
|
|
|
|
|
Version: 4.5.5
|
|
|
|
|
Release: 5%{?dist}
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
URL: http://hc.apache.org/
|
|
|
|
|
Source0: https://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
|
|
|
|
|
|
|
|
|
|
Patch0: 0001-Use-system-copy-of-effective_tld_names.dat.patch
|
|
|
|
|
Patch1: 0002-Port-to-mockito-2.patch
|
|
|
|
|
Patch1: 0002-Incorrect-handling-of-malformed-authority-component-.patch
|
|
|
|
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
BuildRequires: maven-local-openjdk8
|
|
|
|
|
%if %{with bootstrap}
|
|
|
|
|
BuildRequires: javapackages-bootstrap
|
|
|
|
|
%else
|
|
|
|
|
BuildRequires: maven-local
|
|
|
|
|
BuildRequires: mvn(commons-codec:commons-codec)
|
|
|
|
|
BuildRequires: mvn(commons-logging:commons-logging)
|
|
|
|
|
BuildRequires: mvn(junit:junit)
|
|
|
|
|
%if %{with ehcache}
|
|
|
|
|
BuildRequires: mvn(net.sf.ehcache:ehcache-core)
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with memcached}
|
|
|
|
|
BuildRequires: mvn(net.spy:spymemcached)
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
|
|
|
|
BuildRequires: mvn(org.apache.httpcomponents:httpcomponents-parent:pom:)
|
|
|
|
|
BuildRequires: mvn(org.apache.httpcomponents:httpcore)
|
|
|
|
|
BuildRequires: mvn(org.apache.httpcomponents:project:pom:)
|
|
|
|
|
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
|
|
|
|
BuildRequires: mvn(org.easymock:easymock)
|
|
|
|
|
BuildRequires: mvn(org.mockito:mockito-core)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{without bootstrap}
|
|
|
|
|
BuildRequires: publicsuffix-list
|
|
|
|
|
%endif
|
|
|
|
|
Requires: publicsuffix-list
|
|
|
|
|
|
|
|
|
|
Obsoletes: %{name}-tests < 4.4
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on
|
|
|
|
|
httpcomponents HttpCore. It also provides reusable components for
|
|
|
|
|
@ -39,61 +44,91 @@ management. HttpComponents Client is a successor of and replacement
|
|
|
|
|
for Commons HttpClient 3.x. Users of Commons HttpClient are strongly
|
|
|
|
|
encouraged to upgrade.
|
|
|
|
|
|
|
|
|
|
%{?javadoc_package}
|
|
|
|
|
%package cache
|
|
|
|
|
Summary: Cache module for %{name}
|
|
|
|
|
|
|
|
|
|
%description cache
|
|
|
|
|
This package provides client side caching for %{name}.
|
|
|
|
|
|
|
|
|
|
%package javadoc
|
|
|
|
|
Summary: API documentation for %{name}
|
|
|
|
|
|
|
|
|
|
%description javadoc
|
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -n %{name}-%{version}
|
|
|
|
|
%patch -P 0 -p1
|
|
|
|
|
%patch -P 1 -p1
|
|
|
|
|
|
|
|
|
|
%mvn_package :::tests: __noinstall
|
|
|
|
|
%patch0 -p1
|
|
|
|
|
%patch1 -p1
|
|
|
|
|
|
|
|
|
|
# Change scope of commons-logging to provided
|
|
|
|
|
%pom_change_dep :commons-logging :::provided httpclient
|
|
|
|
|
%mvn_package :httpclient-cache cache
|
|
|
|
|
|
|
|
|
|
# Remove optional build deps not available in Fedora
|
|
|
|
|
%pom_disable_module httpclient-osgi
|
|
|
|
|
%pom_disable_module httpclient-win
|
|
|
|
|
%pom_disable_module fluent-hc
|
|
|
|
|
%pom_disable_module httpmime
|
|
|
|
|
%pom_disable_module httpclient-cache
|
|
|
|
|
%pom_remove_plugin :docbkx-maven-plugin
|
|
|
|
|
%pom_remove_plugin :clirr-maven-plugin
|
|
|
|
|
%pom_remove_plugin :maven-checkstyle-plugin
|
|
|
|
|
%pom_remove_plugin :apache-rat-plugin
|
|
|
|
|
%pom_remove_plugin :maven-source-plugin
|
|
|
|
|
%pom_remove_plugin :maven-javadoc-plugin
|
|
|
|
|
%pom_remove_plugin :animal-sniffer-maven-plugin
|
|
|
|
|
|
|
|
|
|
# Fails due to strict crypto policy - uses DSA in test data
|
|
|
|
|
rm httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
|
|
|
|
|
|
|
|
|
|
# Don't compile/run httpclient-cache tests - they are incompatible with EasyMock 3.3
|
|
|
|
|
%pom_remove_plugin org.apache.maven.plugins:maven-jar-plugin httpclient-cache
|
|
|
|
|
%pom_remove_dep org.easymock:easymockclassextension
|
|
|
|
|
for dep in org.easymock:easymockclassextension org.slf4j:slf4j-jcl; do
|
|
|
|
|
%pom_remove_dep $dep httpclient-cache
|
|
|
|
|
done
|
|
|
|
|
rm -rf httpclient-cache/src/test
|
|
|
|
|
|
|
|
|
|
%pom_remove_plugin :download-maven-plugin httpclient
|
|
|
|
|
|
|
|
|
|
%pom_xpath_inject "pom:archive" "
|
|
|
|
|
<manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>"
|
|
|
|
|
# Add proper Apache felix bundle plugin instructions
|
|
|
|
|
# so that we get a reasonable OSGi manifest.
|
|
|
|
|
for module in httpclient httpmime httpclient-cache fluent-hc; do
|
|
|
|
|
%pom_xpath_remove "pom:project/pom:packaging" $module
|
|
|
|
|
%pom_xpath_inject "pom:project" "<packaging>bundle</packaging>" $module
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Make fluent-hc into bundle
|
|
|
|
|
%pom_xpath_inject pom:build "
|
|
|
|
|
<plugins>
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.felix</groupId>
|
|
|
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
|
|
|
<extensions>true</extensions>
|
|
|
|
|
</plugin>
|
|
|
|
|
</plugins>" fluent-hc
|
|
|
|
|
|
|
|
|
|
# Make httpmime into bundle
|
|
|
|
|
%pom_xpath_inject pom:build/pom:plugins "
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.felix</groupId>
|
|
|
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
|
|
|
<executions>
|
|
|
|
|
<execution>
|
|
|
|
|
<id>bundle-manifest</id>
|
|
|
|
|
<phase>process-classes</phase>
|
|
|
|
|
<goals>
|
|
|
|
|
<goal>manifest</goal>
|
|
|
|
|
</goals>
|
|
|
|
|
</execution>
|
|
|
|
|
</executions>
|
|
|
|
|
</plugin>"
|
|
|
|
|
<extensions>true</extensions>
|
|
|
|
|
</plugin>" httpmime
|
|
|
|
|
|
|
|
|
|
%pom_xpath_inject pom:build "
|
|
|
|
|
<pluginManagement>
|
|
|
|
|
<plugins>
|
|
|
|
|
# Make httpclient into bundle
|
|
|
|
|
%pom_xpath_inject pom:reporting/pom:plugins "
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.felix</groupId>
|
|
|
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
|
|
|
<configuration>
|
|
|
|
|
<instructions>
|
|
|
|
|
<Export-Package>*</Export-Package>
|
|
|
|
|
<Private-Package></Private-Package>
|
|
|
|
|
<Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-Package>
|
|
|
|
|
</instructions>
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>" httpclient
|
|
|
|
|
%pom_xpath_inject pom:build/pom:plugins "
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.felix</groupId>
|
|
|
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
|
|
|
<extensions>true</extensions>
|
|
|
|
|
<configuration>
|
|
|
|
|
<instructions>
|
|
|
|
|
<Export-Package>org.apache.http.*,!org.apache.http.param</Export-Package>
|
|
|
|
|
@ -103,14 +138,37 @@ rm httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
|
|
|
|
|
</instructions>
|
|
|
|
|
<excludeDependencies>true</excludeDependencies>
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>
|
|
|
|
|
</plugins>
|
|
|
|
|
</pluginManagement>
|
|
|
|
|
" httpclient
|
|
|
|
|
</plugin>" httpclient
|
|
|
|
|
|
|
|
|
|
# Make httpclient-cache into bundle
|
|
|
|
|
%pom_xpath_inject pom:build/pom:plugins "
|
|
|
|
|
<plugin>
|
|
|
|
|
<groupId>org.apache.felix</groupId>
|
|
|
|
|
<artifactId>maven-bundle-plugin</artifactId>
|
|
|
|
|
<extensions>true</extensions>
|
|
|
|
|
<configuration>
|
|
|
|
|
<instructions>
|
|
|
|
|
<Export-Package>*</Export-Package>
|
|
|
|
|
<Import-Package>net.sf.ehcache;resolution:=optional,net.spy.memcached;resolution:=optional,*</Import-Package>
|
|
|
|
|
<Private-Package></Private-Package>
|
|
|
|
|
<_nouses>true</_nouses>
|
|
|
|
|
</instructions>
|
|
|
|
|
<excludeDependencies>true</excludeDependencies>
|
|
|
|
|
</configuration>
|
|
|
|
|
</plugin>" httpclient-cache
|
|
|
|
|
|
|
|
|
|
# requires network
|
|
|
|
|
rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
|
|
|
|
|
|
|
|
|
|
%if %{without memcached}
|
|
|
|
|
rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/memcached
|
|
|
|
|
%pom_remove_dep :spymemcached httpclient-cache
|
|
|
|
|
%endif
|
|
|
|
|
%if %{without ehcache}
|
|
|
|
|
rm -r httpclient-cache/src/*/java/org/apache/http/impl/client/cache/ehcache
|
|
|
|
|
%pom_remove_dep :ehcache-core httpclient-cache
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%mvn_file ":{*}" httpcomponents/@1
|
|
|
|
|
|
|
|
|
|
@ -119,100 +177,22 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
|
|
|
|
|
%install
|
|
|
|
|
%mvn_install
|
|
|
|
|
|
|
|
|
|
%files -n %{?module_prefix}%{name} -f .mfiles
|
|
|
|
|
%license LICENSE.txt NOTICE.txt
|
|
|
|
|
%doc README.txt RELEASE_NOTES.txt
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 4.5.13-5
|
|
|
|
|
- Fix patch usage
|
|
|
|
|
|
|
|
|
|
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 4.5.13-4
|
|
|
|
|
- Rebuild with regenerated Requires on Java
|
|
|
|
|
|
|
|
|
|
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.13-3
|
|
|
|
|
- Rebuild to regenerate auto-requires
|
|
|
|
|
|
|
|
|
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.5.13-2
|
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
|
|
|
|
|
* Wed Jun 23 2021 Marian Koncek <mkoncek@redhat.com> - 4.5.13-1
|
|
|
|
|
- Update to upstream version 4.5.13
|
|
|
|
|
|
|
|
|
|
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.11-5
|
|
|
|
|
- Rebuild to workaround DistroBaker issue
|
|
|
|
|
|
|
|
|
|
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.11-4
|
|
|
|
|
- Bootstrap Maven for CentOS Stream 9
|
|
|
|
|
|
|
|
|
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.11-3
|
|
|
|
|
- Bootstrap build
|
|
|
|
|
- Non-bootstrap build
|
|
|
|
|
%files -f .mfiles
|
|
|
|
|
%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
|
|
|
|
|
|
|
|
|
|
* Wed Feb 17 2021 Fabio Valentini <decathorpe@gmail.com> - 4.5.10-6
|
|
|
|
|
- Build with -release 8 for better OpenJDK 8 compatibility.
|
|
|
|
|
%files cache -f .mfiles-cache
|
|
|
|
|
|
|
|
|
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.10-5
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
|
%files javadoc -f .mfiles-javadoc
|
|
|
|
|
%doc LICENSE.txt NOTICE.txt
|
|
|
|
|
|
|
|
|
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.10-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.5.10-3
|
|
|
|
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
|
|
|
|
|
|
|
|
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.10-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.11-2
|
|
|
|
|
- Build with OpenJDK 8
|
|
|
|
|
|
|
|
|
|
* Wed Jan 22 2020 Marian Koncek <mkoncek@redhat.com> - 4.5.11-1
|
|
|
|
|
- Update to upstream version 4.5.11
|
|
|
|
|
|
|
|
|
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.10-2
|
|
|
|
|
- Mass rebuild for javapackages-tools 201902
|
|
|
|
|
|
|
|
|
|
* Mon Sep 16 2019 Marian Koncek <mkoncek@redhat.com> - 4.5.10-1
|
|
|
|
|
- Update to upstream version 4.5.10
|
|
|
|
|
|
|
|
|
|
* Mon Sep 16 2019 Marian Koncek <mkoncek@redhat.com> - 4.5.10-1
|
|
|
|
|
- Update to upstream version 4.5.10
|
|
|
|
|
|
|
|
|
|
* Thu Aug 29 2019 Fabio Valentini <decathorpe@gmail.com> - 4.5.7-3
|
|
|
|
|
- Disable memcached and ehcache support.
|
|
|
|
|
|
|
|
|
|
* Mon Jul 29 2019 Marian Koncek <mkoncek@redhat.com> - 4.5.9-1
|
|
|
|
|
- Update to upstream version 4.5.9
|
|
|
|
|
|
|
|
|
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.7-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.8-2
|
|
|
|
|
- Mass rebuild for javapackages-tools 201901
|
|
|
|
|
|
|
|
|
|
* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.8-1
|
|
|
|
|
- Update to upstream version 4.5.8
|
|
|
|
|
|
|
|
|
|
* Mon Feb 04 2019 Marian Koncek <mkoncek@redhat.com> - 4.5.7-1
|
|
|
|
|
- Update to upstream version 4.5.7
|
|
|
|
|
- Fixes: RHBZ #1669148
|
|
|
|
|
|
|
|
|
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.6-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Dec 07 2018 Mat Booth <mat.booth@redhat.com> - 4.5.6-2
|
|
|
|
|
- Add a patch to allow building with mockito 2
|
|
|
|
|
- Don't package tests jars, the tests jars have the same OSGi metadata as the
|
|
|
|
|
main jars, which can cause tycho to resolve the wrong one when building
|
|
|
|
|
eclipse plugins
|
|
|
|
|
|
|
|
|
|
* Mon Oct 8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.6-1
|
|
|
|
|
- Update to upstream version 4.5.6
|
|
|
|
|
%changelog
|
|
|
|
|
* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.5.5-5
|
|
|
|
|
- Rebuilt for MSVSphere 8.8
|
|
|
|
|
|
|
|
|
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.5-5
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
* Sat Sep 25 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.5-5
|
|
|
|
|
- Fix incorrect handling of malformed authority component in request URIs
|
|
|
|
|
- Resolves: CVE-2020-13956
|
|
|
|
|
|
|
|
|
|
* Mon Mar 19 2018 Michael Simacek <msimacek@redhat.com> - 4.5.5-4
|
|
|
|
|
- Fix FTBFS (weak crypto in test data)
|
|
|
|
|
|
