Revert apache 5.1 -> 5.2

1 files changed, 4 insertions, 8 deletions

diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
index 1546da7d9a8..479d6bfe079 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/controller/RetryingClusterControllerClientFactory.java
@@ -8,7 +8,6 @@ import com.yahoo.component.annotation.Inject;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.vespa.applicationmodel.HostName;
 import org.apache.hc.core5.http.message.BasicHeader;
-import org.apache.hc.core5.util.Timeout;
 
 import java.io.IOException;
 import java.util.List;
@@ -26,13 +25,10 @@ public class RetryingClusterControllerClientFactory extends AbstractComponent im
 
     @Inject
     public RetryingClusterControllerClientFactory() {
-        this(AbstractHttpClient.wrapping(VespaHttpClientBuilder
-                .custom()
-                .connectTimeout(Timeout.ofSeconds(5))
-                .apacheBuilder()
-                .setUserAgent("orchestrator-cluster-controller-client")
-                .setDefaultHeaders(List.of(new BasicHeader("Accept", "application/json")))
-                .build()));
+        this(AbstractHttpClient.wrapping(VespaHttpClientBuilder.create()
+                                                               .setUserAgent("orchestrator-cluster-controller-client")
+                                                               .setDefaultHeaders(List.of(new BasicHeader("Accept", "application/json")))
+                                                               .build()));
     }
 
     RetryingClusterControllerClientFactory(HttpClient client) {