.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,26 @@
-SOURCES/httpcomponents-core-4.4.12-src.tar.gz
+/httpcomponents-core-4.1-src.tar.gz
+/httpcomponents-core-4.1.1-src.tar.gz
+/httpcomponents-core-4.1.2-src.tar.gz
+/httpcomponents-core-4.1.3-src.tar.gz
+httpcomponents-core-4.1.4-src.tar.gz
+/httpcomponents-core-4.2.1-src.tar.gz
+/httpcomponents-core-4.2.3-src.tar.gz
+/httpcomponents-core-4.2.4-src.tar.gz
+/httpcomponents-core-4.3-src.tar.gz
+/httpcomponents-core-4.3.2-src.tar.gz
+/httpcomponents-core-4.4-src.tar.gz
+/httpcomponents-core-4.4.1-src.tar.gz
+/httpcomponents-core-4.4.2-src.tar.gz
+/httpcomponents-core-4.4.3-src.tar.gz
+/httpcomponents-core-4.4.4-src.tar.gz
+/httpcomponents-core-4.4.5-src.tar.gz
+/httpcomponents-core-4.4.6-src.tar.gz
+/httpcomponents-core-4.4.7-src.tar.gz
+/httpcomponents-core-4.4.8-src.tar.gz
+/httpcomponents-core-4.4.9-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-4.4.16-src.tar.gz
+/httpcomponents-core-4.4.16-source-release.zip

.httpcomponents-core.metadata

@@ -1 +0,0 @@
-c29457872eabc280f17f66d51cd76a6e079d7308 SOURCES/httpcomponents-core-4.4.12-src.tar.gz

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_contexts:
+  - osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

httpcomponents-core.spec

@@ -1,21 +1,29 @@
+%bcond_with bootstrap
+
 Name:           httpcomponents-core
 Summary:        Set of low level Java HTTP transport components for HTTP services
-Version:        4.4.12
+Version:        4.4.16
-Release:        3%{?dist}
+Release:        9%{?dist}
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            http://hc.apache.org/
-Source0:        http://www.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-%{version}-src.tar.gz
+Source0:        https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-core/%{version}/httpcomponents-core-%{version}-source-release.zip
-Patch0:         0001-Port-to-mockito-2.patch
+Patch1:         0001-Port-to-mockito-2.patch
+Patch2:         0002-Port-to-Mockito-5.patch
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  maven-local
 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,22 +38,25 @@ 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.
 
-%{?module_package}
 %{?javadoc_package}
 
 %prep
 %setup -q
-%patch0 -p1
+%patch 1 -p1
+%patch 2 -p1
 
-# Random test failures on ARM -- 100 ms sleep is not eneough on this
+# Tests failing with Java 17
-# very performant arch, lets make it 2 s
+sed -i '/testAwaitInputInBuffer\|testAwaitInputInSocket\|testNotStaleWhenHasData\|testWriteSmallFragmentBuffering\|testWriteSmallFragmentNoBuffering/i@org.junit.Ignore' httpcore/src/test/java/org/apache/http/impl/{TestBHttpConnectionBase,io/TestSessionInOutBuffers}.java
-sed -i '/Thread.sleep/s/100/2000/' httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
 
 %pom_remove_plugin :maven-checkstyle-plugin
 %pom_remove_plugin :apache-rat-plugin
 %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
@@ -75,20 +86,96 @@ done
 # several other packages expect to find the JARs there
 %mvn_file ":{*}" httpcomponents/@1
 
+# tests fail with OpenJDK 21 due to mocking of sealed classes
+sed -i '/testRequestTargetHostFallback()/i@org.junit.Ignore' httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
+rm httpcore-nio/src/test/java/org/apache/http/impl/nio/TestContentChannel.java
+
 %build
-%mvn_build
+%mvn_build -- -Dmaven.compiler.release=8
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 %doc README.txt RELEASE_NOTES.txt
 
 %changelog
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.12-3
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.4.16-9
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.16-8
+- Port to OpenJDK 21
+- Resolves: RHEL-52711
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 4.4.16-8
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.4.16-7
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.16-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.16-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Dec 12 2023 Marian Koncek <mkoncek@redhat.com> - 4.4.16-4
+- Port to Mockito 5
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.16-3
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.16-2
+- Convert License tag to SPDX format
+
+* Wed Aug 16 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.16-1
+- Update to upstream version 4.4.16
+
+* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.4.13-10
+- Build with default JDK 17
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.13-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.13-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.13-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.4.13-6
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
 
+* 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
 

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: c10s
+execute:
+  how: tmt

sources

@@ -0,0 +1 @@
+SHA512 (httpcomponents-core-4.4.16-source-release.zip) = 110dd58dae9821c7e942e65655a58e2cd40279e96971067ec224d8314354c822a91e88848d46a3937534fca556859f888b230cd8ddf0150e5d6bbdc0eb5f2bbd