re-import sources as agreed with the maintainer

.gitignore

@@ -1,2 +1,23 @@
-SOURCES/httpcomponents-client-4.5.5-src.tar.gz
+/httpcomponents-client-4.0.3-src.tar.gz
+httpcomponents-client-4.1-src.tar.gz
+/httpcomponents-client-4.1.1-src.tar.gz
+/httpcomponents-client-4.1.2-src.tar.gz
+/httpcomponents-client-4.1.3-src.tar.gz
+/httpcomponents-client-4.2.3-src.tar.gz
+/httpcomponents-client-4.2.4-src.tar.gz
+/httpcomponents-client-4.2.5-src.tar.gz
+/httpcomponents-client-4.3-src.tar.gz
+/httpcomponents-client-4.3.1-src.tar.gz
+/httpcomponents-client-4.3.2-src.tar.gz
+/httpcomponents-client-4.3.3-src.tar.gz
+/httpcomponents-client-4.3.4-src.tar.gz
+/httpcomponents-client-4.3.5-src.tar.gz
+/httpcomponents-client-4.4-beta1-src.tar.gz
+/effective_tld_names.dat
+/httpcomponents-client-4.4-src.tar.gz
+/httpcomponents-client-4.4.1-src.tar.gz
+/httpcomponents-client-4.5-src.tar.gz
+/httpcomponents-client-4.5.1-src.tar.gz
+/httpcomponents-client-4.5.2-src.tar.gz
+/httpcomponents-client-4.5.3-src.tar.gz
 /httpcomponents-client-4.5.5-src.tar.gz

0002-Port-to-mockito-2.patch

@@ -1,104 +0,0 @@
-From 852a31061e2d46cc4bc1b5cfa388ed023de5095d Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Fri, 7 Dec 2018 18:01:27 +0000
-Subject: [PATCH 2/2] Port to mockito 2
-
-Gets it building, but disables tests that are caused by change in
-behaviour of mockito that I didn't know how to fix
----
- .../http/impl/client/integration/TestAbortHandling.java      | 1 +
- .../http/impl/client/integration/TestSPNegoScheme.java       | 2 ++
- .../org/apache/http/impl/execchain/TestMainClientExec.java   | 3 ++-
- .../apache/http/impl/execchain/TestMinimalClientExec.java    | 1 +
- .../org/apache/http/impl/execchain/TestRedirectExec.java     | 5 ++---
- 5 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java b/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java
-index 282e11b..0411caf 100644
---- a/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java
-+++ b/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java
-@@ -288,6 +288,7 @@ public class TestAbortHandling extends LocalServerTestBase {
-      * properly released back to the connection manager.
-      */
-     @Test
-+    @org.junit.Ignore
-     public void testSocketConnectFailureReleasesConnection() throws Exception {
-         final HttpClientConnection conn = Mockito.mock(HttpClientConnection.class);
-         final ConnectionRequest connrequest = Mockito.mock(ConnectionRequest.class);
-diff --git a/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java b/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
-index f638031..31799cb 100644
---- a/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
-+++ b/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
-@@ -150,6 +150,7 @@ public class TestSPNegoScheme extends LocalServerTestBase {
-      * the server still keep asking for a valid ticket.
-      */
-     @Test
-+    @org.junit.Ignore
-     public void testDontTryToAuthenticateEndlessly() throws Exception {
-         this.serverBootstrap.registerHandler("*", new PleaseNegotiateService());
-         final HttpHost target = start();
-@@ -180,6 +181,7 @@ public class TestSPNegoScheme extends LocalServerTestBase {
-      * if no token is generated. Client should be able to deal with this response.
-      */
-     @Test
-+    @org.junit.Ignore
-     public void testNoTokenGeneratedError() throws Exception {
-         this.serverBootstrap.registerHandler("*", new PleaseNegotiateService());
-         final HttpHost target = start();
-diff --git a/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java b/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java
-index 2261da8..e922155 100644
---- a/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java
-+++ b/httpclient/src/test/java/org/apache/http/impl/execchain/TestMainClientExec.java
-@@ -402,6 +402,7 @@ public class TestMainClientExec {
-     }
- 
-     @Test(expected=RequestAbortedException.class)
-+    @org.junit.Ignore
-     public void testExecConnectionRequestFailed() throws Exception {
-         final HttpRoute route = new HttpRoute(target);
-         final HttpClientContext context = new HttpClientContext();
-@@ -808,4 +809,4 @@ public class TestMainClientExec {
-         mainClientExec.establishRoute(authState, managedConn, route, request, context);
-     }
- 
--}
-\ No newline at end of file
-+}
-diff --git a/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java b/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java
-index 9a96ba6..41eb023 100644
---- a/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java
-+++ b/httpclient/src/test/java/org/apache/http/impl/execchain/TestMinimalClientExec.java
-@@ -256,6 +256,7 @@ public class TestMinimalClientExec {
-     }
- 
-     @Test(expected=RequestAbortedException.class)
-+    @org.junit.Ignore
-     public void testExecConnectionRequestFailed() throws Exception {
-         final HttpRoute route = new HttpRoute(target);
-         final HttpClientContext context = new HttpClientContext();
-diff --git a/httpclient/src/test/java/org/apache/http/impl/execchain/TestRedirectExec.java b/httpclient/src/test/java/org/apache/http/impl/execchain/TestRedirectExec.java
-index 5621a3f..23506dc 100644
---- a/httpclient/src/test/java/org/apache/http/impl/execchain/TestRedirectExec.java
-+++ b/httpclient/src/test/java/org/apache/http/impl/execchain/TestRedirectExec.java
-@@ -349,7 +349,7 @@ public class TestRedirectExec {
-         }
-     }
- 
--    static class HttpRequestWrapperMatcher extends ArgumentMatcher<HttpRequestWrapper> {
-+    static class HttpRequestWrapperMatcher implements ArgumentMatcher<HttpRequestWrapper> {
- 
-         private final HttpRequest original;
- 
-@@ -358,8 +358,7 @@ public class TestRedirectExec {
-             this.original = original;
-         }
-         @Override
--        public boolean matches(final Object obj) {
--            final HttpRequestWrapper wrapper = (HttpRequestWrapper) obj;
-+        public boolean matches(final HttpRequestWrapper wrapper) {
-             return original == wrapper.getOriginal();
-         }
- 
--- 
-2.19.1
-

gating.yaml

@@ -1,8 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_contexts:
-  - osci_compose_gate
-rules:
-  # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
-  - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}