From a1c532a697731e62f56149ba472da1187fbd5c70 Mon Sep 17 00:00:00 2001
From: Chris Laprun <claprun@redhat.com>
Date: Fri, 30 Aug 2024 15:35:45 +0200
Subject: [PATCH 1/2] fix: clean up dependencies

Signed-off-by: Chris Laprun <claprun@redhat.com>
---
 .../dependent/workflow/WorkflowTest.java      |  4 +---
 operator-framework/pom.xml                    |  1 +
 pom.xml                                       | 20 -------------------
 sample-operators/tomcat-operator/pom.xml      |  6 ------
 4 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java
index bc6ab8515f..72ec14ebbf 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowTest.java
@@ -14,9 +14,7 @@
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.withSettings;
 
diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
index 2f2fd2cee8..fc4a0c8980 100644
--- a/operator-framework/pom.xml
+++ b/operator-framework/pom.xml
@@ -20,6 +20,7 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-httpclient-${fabric8-httpclient-impl.name}</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/pom.xml b/pom.xml
index 255fd7a06b..74d2bc2648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@
         <awaitility.version>4.2.0</awaitility.version>
         <spring-boot.version>2.7.3</spring-boot.version>
         <micrometer-core.version>1.13.3</micrometer-core.version>
-        <okhttp.version>4.12.0</okhttp.version>
         <caffeine.version>3.1.8</caffeine.version>
         <jenvtest.version>0.9.6</jenvtest.version>
         <mustache.version>0.9.11</mustache.version>
@@ -195,25 +194,6 @@
                 <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>
-                <version>${okhttp.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>logging-interceptor</artifactId>
-                <version>${okhttp.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>mockwebserver</artifactId>
-                <version>${okhttp.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>
diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
index f4ca853ce0..c2e32d2abf 100644
--- a/sample-operators/tomcat-operator/pom.xml
+++ b/sample-operators/tomcat-operator/pom.xml
@@ -37,12 +37,6 @@
         <dependency>
             <groupId>io.javaoperatorsdk</groupId>
             <artifactId>operator-framework</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.fabric8</groupId>
-                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>

From fb0918b5d06257c550a01019d2220465e027fad3 Mon Sep 17 00:00:00 2001
From: Chris Laprun <claprun@redhat.com>
Date: Fri, 30 Aug 2024 15:48:36 +0200
Subject: [PATCH 2/2] fix: an HTTP client implementation is required

Signed-off-by: Chris Laprun <claprun@redhat.com>
---
 operator-framework/pom.xml               | 1 -
 sample-operators/tomcat-operator/pom.xml | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/operator-framework/pom.xml b/operator-framework/pom.xml
index fc4a0c8980..2f2fd2cee8 100644
--- a/operator-framework/pom.xml
+++ b/operator-framework/pom.xml
@@ -20,7 +20,6 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-httpclient-${fabric8-httpclient-impl.name}</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
index c2e32d2abf..f4ca853ce0 100644
--- a/sample-operators/tomcat-operator/pom.xml
+++ b/sample-operators/tomcat-operator/pom.xml
@@ -37,6 +37,12 @@
         <dependency>
             <groupId>io.javaoperatorsdk</groupId>
             <artifactId>operator-framework</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.fabric8</groupId>
+                    <artifactId>kubernetes-httpclient-okhttp</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>