Compare commits

...

No commits in common. "c9-beta" and "c8-stream-3.6" have entirely different histories.

3 changed files with 8 additions and 49 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/httpcomponents-core-4.4.13-src.tar.gz SOURCES/httpcomponents-core-4.4.12-src.tar.gz

View File

@ -1 +1 @@
5f5a3976f292591304098739827f48c92f7df80c SOURCES/httpcomponents-core-4.4.13-src.tar.gz c29457872eabc280f17f66d51cd76a6e079d7308 SOURCES/httpcomponents-core-4.4.12-src.tar.gz

View File

@ -1,27 +1,21 @@
%bcond_with bootstrap
Name: httpcomponents-core Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.4.13 Version: 4.4.12
Release: 7%{?dist} Release: 3%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: http://hc.apache.org/ URL: http://hc.apache.org/
Source0: https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz Source0: http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
Patch0: 0001-Port-to-mockito-2.patch Patch0: 0001-Port-to-mockito-2.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: maven-local-openjdk8 BuildRequires: maven-local-openjdk8
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.httpcomponents:httpcomponents-parent:pom:) BuildRequires: mvn(org.apache.httpcomponents:httpcomponents-parent:pom:)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.mockito:mockito-core)
%endif
%description %description
HttpCore is a set of low level HTTP transport components that can be HttpCore is a set of low level HTTP transport components that can be
@ -36,6 +30,7 @@ appropriate for high latency scenarios where raw data throughput is
less important than the ability to handle thousands of simultaneous less important than the ability to handle thousands of simultaneous
HTTP connections in a resource efficient manner. HTTP connections in a resource efficient manner.
%{?module_package}
%{?javadoc_package} %{?javadoc_package}
%prep %prep
@ -51,10 +46,6 @@ sed -i '/Thread.sleep/s/100/2000/' httpcore-nio/src/test/java/org/apache/http/ni
%pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-javadoc-plugin
# We don't have conscrypt for testing
%pom_remove_dep :conscrypt-openjdk-uber httpcore-nio
rm httpcore-nio/src/test/java/org/apache/http/nio/integration/TestJSSEProviderIntegration.java
# we don't need these artifacts right now # we don't need these artifacts right now
%pom_disable_module httpcore-osgi %pom_disable_module httpcore-osgi
%pom_disable_module httpcore-ab %pom_disable_module httpcore-ab
@ -90,46 +81,14 @@ done
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -n %{?module_prefix}%{name} -f .mfiles
%license LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt
%doc README.txt RELEASE_NOTES.txt %doc README.txt RELEASE_NOTES.txt
%changelog %changelog
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.13-7 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.12-3
- Rebuild to regenerate auto-requires
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.4.13-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.13-5
- Rebuild to workaround DistroBaker issue
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.13-4
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.13-3
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.12-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.12-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.4.12-3
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.13-2
- Build with OpenJDK 8 - Build with OpenJDK 8
* Wed Jan 22 2020 Marian Koncek <mkoncek@redhat.com> - 4.4.13-1
- Update to upstream version 4.4.13
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.12-2 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.12-2
- Mass rebuild for javapackages-tools 201902 - Mass rebuild for javapackages-tools 201902