[RESTEASY-1774] Upgrade to apache http client 4.5.4

resteasy · Feb 16, 2018 · bc26bda · bc26bda
1 parent 566cf90
commit bc26bda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -39,7 +39,7 @@
         <version.junit>4.12</version.junit>
         <version.log4j>2.9.1</version.log4j>
         <version.net.jcip.jcip-annotations>1.0</version.net.jcip.jcip-annotations>
-        <version.org.apache.httpcomponents.httpclient>4.5.2</version.org.apache.httpcomponents.httpclient>
+        <version.org.apache.httpcomponents.httpclient>4.5.4</version.org.apache.httpcomponents.httpclient>
         <version.org.apache.httpcomponents.httpcore>4.4.5</version.org.apache.httpcomponents.httpcore>
         <version.org.apache.httpcomponents.httpasyncclient>4.1.3</version.org.apache.httpcomponents.httpasyncclient>
         <version.org.apache.james.apache-mime4j>0.6</version.org.apache.james.apache-mime4j>

diff --git a/...ration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncTimeoutExceptionsTest.java b/...ration-tests/src/test/java/org/jboss/resteasy/test/client/AsyncTimeoutExceptionsTest.java
@@ -105,7 +105,7 @@ private Client prepareHttpClientForMultipleRequests() {
 
         RequestConfig reqConfig = RequestConfig.custom()   // apache HttpClient specific
                 .setConnectTimeout(2000)
-                .setSocketTimeout(2000)
+                .setSocketTimeout(-1)
                 .setConnectionRequestTimeout(200)
                 .build();
         CloseableHttpClient httpClient = HttpClientBuilder.create()