From 17fe35a2d026f7ff6646b9c40fe28f25f22b2833 Mon Sep 17 00:00:00 2001
From: Martin Simka <msimka@redhat.com>
Date: Tue, 23 Nov 2021 13:12:32 +0100
Subject: [PATCH] bump openshift-client to 5.11.1

---
 .../main/java/cz/xtf/core/openshift/ClusterVersionInfo.java    | 3 +--
 core/src/main/java/cz/xtf/core/openshift/OpenShift.java        | 2 +-
 core/src/main/java/cz/xtf/core/openshift/PodShell.java         | 3 +--
 pom.xml                                                        | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java b/core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java
index daec6fa9..3d629cd7 100644
--- a/core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java
+++ b/core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java
@@ -109,8 +109,7 @@ private String detectClusterVersionFromCluster() {
             // admin is required for operation
             try {
                 NonNamespaceOperation<ClusterVersion, ClusterVersionList, Resource<ClusterVersion>> op = OpenShiftHandlers
-                        .getOperation(ClusterVersion.class, ClusterVersionList.class, OpenShifts.admin().getHttpClient(),
-                                OpenShifts.admin().getConfiguration());
+                        .getOperation(ClusterVersion.class, ClusterVersionList.class, OpenShifts.admin());
                 openshiftVersion = op.withName("version").get().getStatus().getDesired().getVersion();
             } catch (KubernetesClientException kce) {
                 log.warn("xtf.openshift.version isn't configured and automatic version detection failed.", kce);
diff --git a/core/src/main/java/cz/xtf/core/openshift/OpenShift.java b/core/src/main/java/cz/xtf/core/openshift/OpenShift.java
index 8082a010..068bbdd9 100644
--- a/core/src/main/java/cz/xtf/core/openshift/OpenShift.java
+++ b/core/src/main/java/cz/xtf/core/openshift/OpenShift.java
@@ -186,7 +186,7 @@ protected static synchronized ServiceLoader<CustomResourceDefinitionContextProvi
     public OpenShift(OpenShiftConfig openShiftConfig) {
         super(openShiftConfig);
 
-        appsAPIGroupClient = new AppsAPIGroupClient(httpClient, openShiftConfig);
+        appsAPIGroupClient = new AppsAPIGroupClient(this);
 
         this.waiters = new OpenShiftWaiters(this);
     }
diff --git a/core/src/main/java/cz/xtf/core/openshift/PodShell.java b/core/src/main/java/cz/xtf/core/openshift/PodShell.java
index 005387e3..7cb86d04 100644
--- a/core/src/main/java/cz/xtf/core/openshift/PodShell.java
+++ b/core/src/main/java/cz/xtf/core/openshift/PodShell.java
@@ -10,7 +10,6 @@
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.client.dsl.ExecListener;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.Response;
 
 @Slf4j
 public class PodShell {
@@ -71,7 +70,7 @@ public class StateExecListener implements ExecListener {
         private final AtomicBoolean executionDone = new AtomicBoolean(false);
 
         @Override
-        public void onOpen(Response response) {
+        public void onOpen() {
             // DO NOTHING
         }
 
diff --git a/pom.xml b/pom.xml
index cced0c09..8b30ffb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 
         <!-- Dependency version properties -->
         <version.httpclient>4.5.13</version.httpclient>
-        <version.openshift-client>5.9.0</version.openshift-client>
+        <version.openshift-client>5.11.1</version.openshift-client>
         <version.commons-io>2.8.0</version.commons-io>
         <version.commons-lang3>3.11</version.commons-lang3>
         <version.commons-compress>1.21</version.commons-compress>