From bece0922680764dca73daf956b67d85799d50b45 Mon Sep 17 00:00:00 2001
From: BF2 Robot <hchirino+bf2@redhat.com>
Date: Tue, 28 Mar 2023 05:47:28 +0000
Subject: [PATCH 1/2] Update dependency io.strimzi:api to v0.34.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 242c4bddc..8638e59c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <quarkus.platform.test.version>2.13.7.Final</quarkus.platform.test.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus-plugin.version>${quarkus.platform.version}</quarkus-plugin.version>
-        <strimzi.version>0.29.0</strimzi.version>
+        <strimzi.version>0.34.0</strimzi.version>
         <fabric8.client.version>5.12.4</fabric8.client.version>
         <quarkus.operator.extension>4.0.8</quarkus.operator.extension>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>

From 541721590597d42479f0dd655b7525db01032f2a Mon Sep 17 00:00:00 2001
From: Michael Edgar <medgar@redhat.com>
Date: Tue, 28 Mar 2023 10:34:04 -0400
Subject: [PATCH 2/2] Accounting for changes in Strimzi API library

Signed-off-by: Michael Edgar <medgar@redhat.com>
---
 .../java/org/bf2/common/AbstractCustomResourceClient.java     | 4 ++--
 .../java/org/bf2/operator/operands/AbstractKafkaCluster.java  | 2 +-
 .../src/main/java/org/bf2/systemtest/api/github/Release.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/org/bf2/common/AbstractCustomResourceClient.java b/common/src/main/java/org/bf2/common/AbstractCustomResourceClient.java
index cd526d690..3d69c8f9e 100644
--- a/common/src/main/java/org/bf2/common/AbstractCustomResourceClient.java
+++ b/common/src/main/java/org/bf2/common/AbstractCustomResourceClient.java
@@ -1,8 +1,8 @@
 package org.bf2.common;
 
+import io.fabric8.kubernetes.api.model.DefaultKubernetesResourceList;
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
 import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.CustomResourceList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -18,7 +18,7 @@
  * @deprecated to be removed after fabric8 6
  */
 @Deprecated
-public abstract class AbstractCustomResourceClient<T extends CustomResource<?, ?>, L extends CustomResourceList<T>> {
+public abstract class AbstractCustomResourceClient<T extends CustomResource<?, ?>, L extends DefaultKubernetesResourceList<T>> {
 
     @Inject
     Logger log;
diff --git a/operator/src/main/java/org/bf2/operator/operands/AbstractKafkaCluster.java b/operator/src/main/java/org/bf2/operator/operands/AbstractKafkaCluster.java
index 2634649c1..c7bafa42b 100644
--- a/operator/src/main/java/org/bf2/operator/operands/AbstractKafkaCluster.java
+++ b/operator/src/main/java/org/bf2/operator/operands/AbstractKafkaCluster.java
@@ -3,6 +3,7 @@
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.Quantity;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyPeerBuilder;
+import io.fabric8.kubernetes.client.CustomResourceFluent.MetadataNested;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.openshift.api.model.Route;
 import io.fabric8.openshift.client.OpenShiftClient;
@@ -15,7 +16,6 @@
 import io.strimzi.api.kafka.model.GenericSecretSourceBuilder;
 import io.strimzi.api.kafka.model.Kafka;
 import io.strimzi.api.kafka.model.KafkaBuilder;
-import io.strimzi.api.kafka.model.KafkaFluent.MetadataNested;
 import io.strimzi.api.kafka.model.KafkaResources;
 import io.strimzi.api.kafka.model.StrimziPodSet;
 import io.strimzi.api.kafka.model.listener.KafkaListenerAuthentication;
diff --git a/systemtest/src/main/java/org/bf2/systemtest/api/github/Release.java b/systemtest/src/main/java/org/bf2/systemtest/api/github/Release.java
index 495e0106d..3a125cc59 100644
--- a/systemtest/src/main/java/org/bf2/systemtest/api/github/Release.java
+++ b/systemtest/src/main/java/org/bf2/systemtest/api/github/Release.java
@@ -1,7 +1,7 @@
 package org.bf2.systemtest.api.github;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.vertx.core.json.Json;
+import io.fabric8.kubernetes.client.utils.Serialization;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Release {
@@ -12,6 +12,6 @@ public class Release {
 
     @Override
     public String toString() {
-        return Json.encode(this);
+        return Serialization.asJson(this);
     }
 }