From 0bb3e669a32e0948258e75e979dd5c6ac68dabbe Mon Sep 17 00:00:00 2001
From: Jakub Stejskal <xstejs24@gmail.com>
Date: Fri, 29 Mar 2024 12:37:48 +0100
Subject: [PATCH] Upgrade Strimzi depdenency to version 0.40.0, junit to 3.2.5

Signed-off-by: Jakub Stejskal <xstejs24@gmail.com>
---
 pom.xml                                       | 10 +++----
 src/main/java/io/tealc/KubeClient.java        | 28 +++++++++----------
 .../worker01/status/ComponentsStatusTest.java |  6 ++--
 .../worker01/status/TopicStatusTest.java      |  2 +-
 .../worker01/status/UsersStatusTest.java      |  2 +-
 .../worker02/status/ComponentsStatusTest.java |  2 +-
 .../worker02/status/TopicStatusTest.java      |  2 +-
 .../worker02/status/UsersStatusTest.java      |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39ec9b1..cdcbbaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,16 +12,16 @@
         <maven.compiler.target>17</maven.compiler.target>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.surefire.version>3.0.0-M7</maven.surefire.version>
-        <maven.failsafe.version>3.0.0-M7</maven.failsafe.version>
+        <maven.surefire.version>3.2.5</maven.surefire.version>
+        <maven.failsafe.version>3.2.5</maven.failsafe.version>
         <checkstyle.version>10.9.2</checkstyle.version>
         <spotbugs.version>4.7.3</spotbugs.version>
-        <fabric8.version>6.6.2</fabric8.version>
+        <fabric8.version>6.10.0</fabric8.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <junit.version>5.9.2</junit.version>
+        <junit.version>5.10.2</junit.version>
         <slf4j.version>1.7.33</slf4j.version>
         <maven.checkstyle.version>3.1.2</maven.checkstyle.version>
-        <strimzi.version>0.36.1</strimzi.version>
+        <strimzi.version>0.40.0</strimzi.version>
         <reportportal.version>5.1.0</reportportal.version>
         <lombok.version>1.18.24</lombok.version>
         <sundrio.version>0.93.1</sundrio.version>
diff --git a/src/main/java/io/tealc/KubeClient.java b/src/main/java/io/tealc/KubeClient.java
index f55606d..4f20b31 100644
--- a/src/main/java/io/tealc/KubeClient.java
+++ b/src/main/java/io/tealc/KubeClient.java
@@ -22,20 +22,20 @@
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.strimzi.api.kafka.Crds;
-import io.strimzi.api.kafka.KafkaConnectList;
-import io.strimzi.api.kafka.KafkaConnectorList;
-import io.strimzi.api.kafka.KafkaList;
-import io.strimzi.api.kafka.KafkaMirrorMaker2List;
-import io.strimzi.api.kafka.KafkaRebalanceList;
-import io.strimzi.api.kafka.KafkaTopicList;
-import io.strimzi.api.kafka.KafkaUserList;
-import io.strimzi.api.kafka.model.Kafka;
-import io.strimzi.api.kafka.model.KafkaConnect;
-import io.strimzi.api.kafka.model.KafkaConnector;
-import io.strimzi.api.kafka.model.KafkaMirrorMaker2;
-import io.strimzi.api.kafka.model.KafkaRebalance;
-import io.strimzi.api.kafka.model.KafkaTopic;
-import io.strimzi.api.kafka.model.KafkaUser;
+import io.strimzi.api.kafka.model.connect.KafkaConnectList;
+import io.strimzi.api.kafka.model.connector.KafkaConnectorList;
+import io.strimzi.api.kafka.model.kafka.KafkaList;
+import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2List;
+import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceList;
+import io.strimzi.api.kafka.model.topic.KafkaTopicList;
+import io.strimzi.api.kafka.model.user.KafkaUserList;
+import io.strimzi.api.kafka.model.kafka.Kafka;
+import io.strimzi.api.kafka.model.connect.KafkaConnect;
+import io.strimzi.api.kafka.model.connector.KafkaConnector;
+import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2;
+import io.strimzi.api.kafka.model.rebalance.KafkaRebalance;
+import io.strimzi.api.kafka.model.topic.KafkaTopic;
+import io.strimzi.api.kafka.model.user.KafkaUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/io/tealc/worker01/status/ComponentsStatusTest.java b/src/test/java/io/tealc/worker01/status/ComponentsStatusTest.java
index 7319e79..1299adb 100644
--- a/src/test/java/io/tealc/worker01/status/ComponentsStatusTest.java
+++ b/src/test/java/io/tealc/worker01/status/ComponentsStatusTest.java
@@ -4,9 +4,9 @@
  */
 package io.tealc.worker01.status;
 
-import io.strimzi.api.kafka.model.Kafka;
-import io.strimzi.api.kafka.model.KafkaConnect;
-import io.strimzi.api.kafka.model.KafkaMirrorMaker2;
+import io.strimzi.api.kafka.model.kafka.Kafka;
+import io.strimzi.api.kafka.model.connect.KafkaConnect;
+import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2;
 import io.tealc.Abstract;
 import io.tealc.ClusterManager;
 import io.tealc.EClusters;
diff --git a/src/test/java/io/tealc/worker01/status/TopicStatusTest.java b/src/test/java/io/tealc/worker01/status/TopicStatusTest.java
index c8c18f3..99ee719 100644
--- a/src/test/java/io/tealc/worker01/status/TopicStatusTest.java
+++ b/src/test/java/io/tealc/worker01/status/TopicStatusTest.java
@@ -4,7 +4,7 @@
  */
 package io.tealc.worker01.status;
 
-import io.strimzi.api.kafka.model.KafkaTopic;
+import io.strimzi.api.kafka.model.topic.KafkaTopic;
 import io.tealc.Abstract;
 import io.tealc.ClusterManager;
 import io.tealc.EClusters;
diff --git a/src/test/java/io/tealc/worker01/status/UsersStatusTest.java b/src/test/java/io/tealc/worker01/status/UsersStatusTest.java
index 5c829e4..0118eaf 100644
--- a/src/test/java/io/tealc/worker01/status/UsersStatusTest.java
+++ b/src/test/java/io/tealc/worker01/status/UsersStatusTest.java
@@ -4,7 +4,7 @@
  */
 package io.tealc.worker01.status;
 
-import io.strimzi.api.kafka.model.KafkaUser;
+import io.strimzi.api.kafka.model.user.KafkaUser;
 import io.tealc.Abstract;
 import io.tealc.ClusterManager;
 import io.tealc.EClusters;
diff --git a/src/test/java/io/tealc/worker02/status/ComponentsStatusTest.java b/src/test/java/io/tealc/worker02/status/ComponentsStatusTest.java
index aa15118..63b0ddc 100644
--- a/src/test/java/io/tealc/worker02/status/ComponentsStatusTest.java
+++ b/src/test/java/io/tealc/worker02/status/ComponentsStatusTest.java
@@ -4,7 +4,7 @@
  */
 package io.tealc.worker02.status;
 
-import io.strimzi.api.kafka.model.Kafka;
+import io.strimzi.api.kafka.model.kafka.Kafka;
 import io.tealc.Abstract;
 import io.tealc.ClusterManager;
 import io.tealc.EClusters;
diff --git a/src/test/java/io/tealc/worker02/status/TopicStatusTest.java b/src/test/java/io/tealc/worker02/status/TopicStatusTest.java
index 537dc56..6311951 100644
--- a/src/test/java/io/tealc/worker02/status/TopicStatusTest.java
+++ b/src/test/java/io/tealc/worker02/status/TopicStatusTest.java
@@ -4,7 +4,7 @@
  */
 package io.tealc.worker02.status;
 
-import io.strimzi.api.kafka.model.KafkaTopic;
+import io.strimzi.api.kafka.model.topic.KafkaTopic;
 import io.tealc.Abstract;
 import io.tealc.ClusterManager;
 import io.tealc.EClusters;
diff --git a/src/test/java/io/tealc/worker02/status/UsersStatusTest.java b/src/test/java/io/tealc/worker02/status/UsersStatusTest.java
index ea87f98..fd4b60e 100644
--- a/src/test/java/io/tealc/worker02/status/UsersStatusTest.java
+++ b/src/test/java/io/tealc/worker02/status/UsersStatusTest.java
@@ -4,7 +4,7 @@
  */
 package io.tealc.worker02.status;
 
-import io.strimzi.api.kafka.model.KafkaUser;
+import io.strimzi.api.kafka.model.user.KafkaUser;
 import io.tealc.Abstract;
 import io.tealc.ClusterManager;
 import io.tealc.EClusters;