improve: bump fabric8 client to 7.5.1 and fix dependency issues with junit (#275)

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

pom.xml

@@ -54,8 +54,8 @@
     <josdk.version>5.2.2</josdk.version>
     <spring-boot.version>4.0.1</spring-boot.version>
     <surefire.version>3.5.4</surefire.version>
-    <fabric8-client.version>7.4.0</fabric8-client.version>
-    <jenvtest.version>0.9.7</jenvtest.version>
+    <fabric8-client.version>7.5.1</fabric8-client.version>
+    <junit.version>6.0.2</junit.version>
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
     <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
@@ -105,15 +105,33 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>io.javaoperatorsdk</groupId>
-        <artifactId>jenvtest</artifactId>
-        <version>${jenvtest.version}</version>
+        <groupId>io.fabric8</groupId>
+        <artifactId>kube-api-test-client-inject</artifactId>
+        <version>${fabric8-client.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>io.javaoperatorsdk</groupId>
-        <artifactId>jenvtest-fabric8-client-support</artifactId>
-        <version>${jenvtest.version}</version>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-api</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-params</artifactId>
+        <version>${junit.version}</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

starter/pom.xml

@@ -122,13 +122,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.javaoperatorsdk</groupId>
-      <artifactId>jenvtest</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.javaoperatorsdk</groupId>
-      <artifactId>jenvtest-fabric8-client-support</artifactId>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kube-api-test-client-inject</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationIntegrationTest.java

@@ -6,10 +6,10 @@
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 
+import io.fabric8.kubeapitest.junit.EnableKubeAPIServer;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.ListOptionsBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.springboot.starter.CRDApplier.CRDTransformer;
 
 import static org.assertj.core.api.Assertions.assertThat;