From 2501e61362fe2bec3eab4962bdd6e8be18375458 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Fri, 22 Jul 2022 13:29:50 +0200
Subject: [PATCH 1/4] feat: update to okhttp4

---
 .../processing/event/source/CustomResourceSelectorTest.java  | 2 ++
 pom.xml                                                      | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java
index f0f0bb0e62..b7c6c4667a 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java
@@ -7,6 +7,7 @@
 
 import org.awaitility.core.ConditionTimeoutException;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,6 +37,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+@Disabled("issues with okhttp4")
 @EnableKubernetesMockClient(crud = true, https = false)
 class CustomResourceSelectorTest {
 
diff --git a/pom.xml b/pom.xml
index 5aba9983ef..9580b43104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,11 @@
                 <artifactId>operator-framework</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>4.10.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 9ca90c009b5a7b149ff1ba6fc3f96d34cb5e5754 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Fri, 22 Jul 2022 13:46:23 +0200
Subject: [PATCH 2/4] fix: other okhttp dependencies

---
 .../event/source/CustomResourceSelectorTest.java      |  2 --
 pom.xml                                               | 11 +++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java
index b7c6c4667a..f0f0bb0e62 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/CustomResourceSelectorTest.java
@@ -7,7 +7,6 @@
 
 import org.awaitility.core.ConditionTimeoutException;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +36,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-@Disabled("issues with okhttp4")
 @EnableKubernetesMockClient(crud = true, https = false)
 class CustomResourceSelectorTest {
 
diff --git a/pom.xml b/pom.xml
index 9580b43104..4a5407e487 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
         <formatter-maven-plugin.version>2.19.0</formatter-maven-plugin.version>
         <directory-maven-plugin.version>1.0</directory-maven-plugin.version>
         <impsort-maven-plugin.version>1.7.0</impsort-maven-plugin.version>
+        <okhttp.version>4.10.0</okhttp.version>
     </properties>
 
     <modules>
@@ -169,6 +170,16 @@
                 <artifactId>okhttp</artifactId>
                 <version>4.10.0</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>logging-interceptor</artifactId>
+                <version>4.10.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>mockwebserver</artifactId>
+                <version>4.10.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 3215e83313f033d5f90c6bf53d2da78f8ed6cfaa Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Fri, 22 Jul 2022 13:48:40 +0200
Subject: [PATCH 3/4] fix: http version property

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4a5407e487..f13c4c0f44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,17 +168,17 @@
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp</artifactId>
-                <version>4.10.0</version>
+                <version>${okhttp.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>logging-interceptor</artifactId>
-                <version>4.10.0</version>
+                <version>${okhttp.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>mockwebserver</artifactId>
-                <version>4.10.0</version>
+                <version>${okhttp.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

From fd0b09e9680c0433bcbc771961b11e8d37aafc90 Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Fri, 22 Jul 2022 14:23:00 +0200
Subject: [PATCH 4/4] comment in pom

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index f13c4c0f44..1321b6a0b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,6 +165,10 @@
                 <artifactId>operator-framework</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!--
+            regarding the okhttp explicit version
+            see https://github.com/fabric8io/kubernetes-client/issues/4290
+            -->
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp</artifactId>