Merge modular branch

.gitignore

@@ -21,3 +21,4 @@ httpcomponents-core-4.1.4-src.tar.gz
 /httpcomponents-core-4.4.10-src.tar.gz
 /httpcomponents-core-4.4.11-src.tar.gz
 /httpcomponents-core-4.4.12-src.tar.gz
+/httpcomponents-core-4.4.13-src.tar.gz

httpcomponents-core.spec

@@ -1,21 +1,27 @@
+%bcond_with bootstrap
+
 Name:           httpcomponents-core
 Summary:        Set of low level Java HTTP transport components for HTTP services
-Version:        4.4.12
-Release:        5%{?dist}
+Version:        4.4.13
+Release:        2%{?dist}
 License:        ASL 2.0
 URL:            http://hc.apache.org/
-Source0:        http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
+Source0:        https://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
 Patch0:         0001-Port-to-mockito-2.patch
 
 BuildArch:      noarch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.httpcomponents:httpcomponents-parent:pom:)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.mockito:mockito-core)
+%endif
 
 %description
 HttpCore is a set of low level HTTP transport components that can be
@@ -30,12 +36,7 @@ appropriate for high latency scenarios where raw data throughput is
 less important than the ability to handle thousands of simultaneous
 HTTP connections in a resource efficient manner.
 
-%package        javadoc
-Summary:        API documentation for %{name}
-
-%description    javadoc
-%{summary}.
-
+%{?javadoc_package}
 
 %prep
 %setup -q
@@ -50,6 +51,10 @@ 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-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
 %pom_disable_module httpcore-osgi
 %pom_disable_module httpcore-ab
@@ -86,10 +91,8 @@ done
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
-
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
+%doc README.txt RELEASE_NOTES.txt
 
 %changelog
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.12-5
@@ -104,6 +107,15 @@ done
 * 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
+
+* 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
+- Mass rebuild for javapackages-tools 201902
+
 * Mon Sep 16 2019 Marian Koncek <mkoncek@redhat.com> - 4.4.12-1
 - Update to upstream version 4.4.12
 

sources

@@ -1 +1 @@
-SHA512 (httpcomponents-core-4.4.12-src.tar.gz) = 30eac1881973f4e6a48b53e3ff69bbd6990344ea0d5f86ab953042058d1f0f0fdc96280ea668a6839b5e66b4b045140aca7cc88b240b568d9823a21fb23dd432
+SHA512 (httpcomponents-core-4.4.13-src.tar.gz) = 7a752363a090e6f6de30fea295f7b59d268059b3e3ef5164de8f88c6ef02215c2f653154f4567d52fd91eaf832564f784f5365b6ba8a342fce8222439dfa7c74