From 636ee7a8bf233efef0b03ab4ead608af92dbc0f5 Mon Sep 17 00:00:00 2001
From: ShubhamRwt <shubhamrwt02@gmail.com>
Date: Wed, 1 Mar 2023 23:02:03 +0530
Subject: [PATCH 1/4] Updated the deps

Signed-off-by: ShubhamRwt <shubhamrwt02@gmail.com>
---
 docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml | 2 +-
 docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml | 2 +-
 docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml    | 2 +-
 pom.xml                                                     | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml b/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml
index 3e758851f94..749db086198 100644
--- a/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml
+++ b/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml
@@ -354,7 +354,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
+            <version>2.0</version>
         </dependency>
         <!-- EnvVar Configuration Provider for Apache Kafka -->
         <dependency>
diff --git a/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml b/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml
index 3e758851f94..749db086198 100644
--- a/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml
+++ b/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml
@@ -354,7 +354,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
+            <version>2.0</version>
         </dependency>
         <!-- EnvVar Configuration Provider for Apache Kafka -->
         <dependency>
diff --git a/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml b/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml
index b58cce88245..41437bfbb5a 100644
--- a/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml
+++ b/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
+            <version>2.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 7509aec2343..e6ffe248087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,9 +113,9 @@
         <fasterxml.jackson-annotations.version>2.14.1</fasterxml.jackson-annotations.version>
         <!-- This is used to override CVE-2022-25857 and CVE-2022-41854 => should be removed once jackson-dataformat-yaml uses it out of the box -->
         <!-- https://github.com/strimzi/strimzi-kafka-operator/issues/7261 covers the removal of this override -->
-        <snakeyaml.version>1.33</snakeyaml.version>
-        <vertx.version>4.3.7</vertx.version>
-        <vertx-junit5.version>4.3.7</vertx-junit5.version>
+        <snakeyaml.version>2.0</snakeyaml.version>
+        <vertx.version>4.3.8</vertx.version>
+        <vertx-junit5.version>4.3.8</vertx-junit5.version>
         <kafka.version>3.4.0</kafka.version>
         <yammer-metrics.version>2.2.0</yammer-metrics.version>
         <scala-library.version>2.13.9</scala-library.version>

From f4e34e8e94c047e23dd58ba8d535cadaeb30f9c2 Mon Sep 17 00:00:00 2001
From: ShubhamRwt <shubhamrwt02@gmail.com>
Date: Thu, 2 Mar 2023 00:00:36 +0530
Subject: [PATCH 2/4] Updated the jackson deps

Signed-off-by: ShubhamRwt <shubhamrwt02@gmail.com>
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6ffe248087..e8f7c0532b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,10 +107,10 @@
         <fabric8.openshift-client.version>6.3.1</fabric8.openshift-client.version>
         <fabric8.kubernetes-model.version>6.3.1</fabric8.kubernetes-model.version>
         <fabric8.zjsonpatch.version>0.3.0</fabric8.zjsonpatch.version>
-        <fasterxml.jackson-core.version>2.14.1</fasterxml.jackson-core.version>
-        <fasterxml.jackson-databind.version>2.14.1</fasterxml.jackson-databind.version>
-        <fasterxml.jackson-dataformat.version>2.14.1</fasterxml.jackson-dataformat.version>
-        <fasterxml.jackson-annotations.version>2.14.1</fasterxml.jackson-annotations.version>
+        <fasterxml.jackson-core.version>2.14.2</fasterxml.jackson-core.version>
+        <fasterxml.jackson-databind.version>2.14.2</fasterxml.jackson-databind.version>
+        <fasterxml.jackson-dataformat.version>2.14.2</fasterxml.jackson-dataformat.version>
+        <fasterxml.jackson-annotations.version>2.14.2</fasterxml.jackson-annotations.version>
         <!-- This is used to override CVE-2022-25857 and CVE-2022-41854 => should be removed once jackson-dataformat-yaml uses it out of the box -->
         <!-- https://github.com/strimzi/strimzi-kafka-operator/issues/7261 covers the removal of this override -->
         <snakeyaml.version>2.0</snakeyaml.version>

From 56c2678b6000cc17ba7d18a354ac665f2d900100 Mon Sep 17 00:00:00 2001
From: ShubhamRwt <shubhamrwt02@gmail.com>
Date: Fri, 10 Mar 2023 13:02:26 +0530
Subject: [PATCH 3/4] Updated netty and vertx

Signed-off-by: ShubhamRwt <shubhamrwt02@gmail.com>
---
 .../artifacts/kafka-thirdparty-libs/3.3.x/pom.xml    |  2 +-
 .../artifacts/kafka-thirdparty-libs/3.4.x/pom.xml    |  2 +-
 .../artifacts/kafka-thirdparty-libs/cc/pom.xml       |  2 +-
 pom.xml                                              | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml b/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml
index 749db086198..3e758851f94 100644
--- a/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml
+++ b/docker-images/artifacts/kafka-thirdparty-libs/3.3.x/pom.xml
@@ -354,7 +354,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.0</version>
+            <version>1.33</version>
         </dependency>
         <!-- EnvVar Configuration Provider for Apache Kafka -->
         <dependency>
diff --git a/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml b/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml
index 749db086198..3e758851f94 100644
--- a/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml
+++ b/docker-images/artifacts/kafka-thirdparty-libs/3.4.x/pom.xml
@@ -354,7 +354,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.0</version>
+            <version>1.33</version>
         </dependency>
         <!-- EnvVar Configuration Provider for Apache Kafka -->
         <dependency>
diff --git a/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml b/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml
index 41437bfbb5a..b58cce88245 100644
--- a/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml
+++ b/docker-images/artifacts/kafka-thirdparty-libs/cc/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.0</version>
+            <version>1.33</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index e8f7c0532b3..858db58a647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,13 +107,13 @@
         <fabric8.openshift-client.version>6.3.1</fabric8.openshift-client.version>
         <fabric8.kubernetes-model.version>6.3.1</fabric8.kubernetes-model.version>
         <fabric8.zjsonpatch.version>0.3.0</fabric8.zjsonpatch.version>
-        <fasterxml.jackson-core.version>2.14.2</fasterxml.jackson-core.version>
-        <fasterxml.jackson-databind.version>2.14.2</fasterxml.jackson-databind.version>
-        <fasterxml.jackson-dataformat.version>2.14.2</fasterxml.jackson-dataformat.version>
-        <fasterxml.jackson-annotations.version>2.14.2</fasterxml.jackson-annotations.version>
+        <fasterxml.jackson-core.version>2.14.1</fasterxml.jackson-core.version>
+        <fasterxml.jackson-databind.version>2.14.1</fasterxml.jackson-databind.version>
+        <fasterxml.jackson-dataformat.version>2.14.1</fasterxml.jackson-dataformat.version>
+        <fasterxml.jackson-annotations.version>2.14.1</fasterxml.jackson-annotations.version>
         <!-- This is used to override CVE-2022-25857 and CVE-2022-41854 => should be removed once jackson-dataformat-yaml uses it out of the box -->
         <!-- https://github.com/strimzi/strimzi-kafka-operator/issues/7261 covers the removal of this override -->
-        <snakeyaml.version>2.0</snakeyaml.version>
+        <snakeyaml.version>1.33</snakeyaml.version>
         <vertx.version>4.3.8</vertx.version>
         <vertx-junit5.version>4.3.8</vertx-junit5.version>
         <kafka.version>3.4.0</kafka.version>
@@ -131,7 +131,7 @@
         <jetty.version>9.4.48.v20220622</jetty.version>
         <javax-servlet.version>3.1.0</javax-servlet.version>
         <strimzi-oauth.version>0.11.0</strimzi-oauth.version>
-        <netty.version>4.1.86.Final</netty.version>
+        <netty.version>4.1.89.Final</netty.version>
         <micrometer.version>1.9.5</micrometer.version>
         <jayway-jsonpath.version>2.6.0</jayway-jsonpath.version>
         <registry.version>1.3.2.Final</registry.version>

From 89f9a93e761a03aed1f8f48ce5b48e4fb1c0c1e6 Mon Sep 17 00:00:00 2001
From: ShubhamRwt <shubhamrwt02@gmail.com>
Date: Fri, 10 Mar 2023 18:50:01 +0530
Subject: [PATCH 4/4] moved netty to 4.1.87

Signed-off-by: ShubhamRwt <shubhamrwt02@gmail.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 858db58a647..e85166f71d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
         <jetty.version>9.4.48.v20220622</jetty.version>
         <javax-servlet.version>3.1.0</javax-servlet.version>
         <strimzi-oauth.version>0.11.0</strimzi-oauth.version>
-        <netty.version>4.1.89.Final</netty.version>
+        <netty.version>4.1.87.Final</netty.version>
         <micrometer.version>1.9.5</micrometer.version>
         <jayway-jsonpath.version>2.6.0</jayway-jsonpath.version>
         <registry.version>1.3.2.Final</registry.version>