From 3337cdaa35b9640e3e50e2c48f7cb0a9957618a4 Mon Sep 17 00:00:00 2001
From: Dmitry Werner <grimekillah@gmail.com>
Date: Tue, 3 Dec 2024 13:29:50 +0500
Subject: [PATCH 1/3] BE: CVE fixes

---
 api/pom.xml | 2 +-
 pom.xml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 8452167ce..3f7c044d0 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
-            <version>1.13.3</version>
+            <version>1.14.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.netty</groupId>
diff --git a/pom.xml b/pom.xml
index e38658fbb..683abf771 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,13 +39,13 @@
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>
-        <kafka-clients.version>3.5.2</kafka-clients.version>
+        <kafka-clients.version>3.7.1</kafka-clients.version>
         <org.mapstruct.version>1.6.2</org.mapstruct.version>
         <org.projectlombok.version>1.18.34</org.projectlombok.version>
         <protobuf-java.version>3.25.5</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.3</snakeyaml.version>
-        <spring-boot.version>3.3.4</spring-boot.version>
+        <spring-boot.version>3.3.6</spring-boot.version>
         <serde-api.version>1.0.0</serde-api.version>
         <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.39</odd-oddrn-client.version>

From 807a0973f984131aa600fa86f5c4c1f369e51f20 Mon Sep 17 00:00:00 2001
From: Dmitry Werner <grimekillah@gmail.com>
Date: Tue, 3 Dec 2024 14:02:19 +0500
Subject: [PATCH 2/3] BE: CVE fixes

fix build
---
 contract/src/main/resources/swagger/kafbat-ui-api.yaml          | 1 +
 frontend/src/components/Brokers/Broker/Configs/lib/constants.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/contract/src/main/resources/swagger/kafbat-ui-api.yaml b/contract/src/main/resources/swagger/kafbat-ui-api.yaml
index 5eede6cef..04cc17514 100644
--- a/contract/src/main/resources/swagger/kafbat-ui-api.yaml
+++ b/contract/src/main/resources/swagger/kafbat-ui-api.yaml
@@ -3779,6 +3779,7 @@ components:
         - DYNAMIC_BROKER_LOGGER_CONFIG
         - DYNAMIC_BROKER_CONFIG
         - DYNAMIC_DEFAULT_BROKER_CONFIG
+        - DYNAMIC_CLIENT_METRICS_CONFIG
         - STATIC_BROKER_CONFIG
         - DEFAULT_CONFIG
         - UNKNOWN
diff --git a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
index 5a829323a..e681c52be 100644
--- a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
+++ b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
@@ -5,6 +5,7 @@ export const CONFIG_SOURCE_NAME_MAP: Record<ConfigSource, string> = {
   [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 'Dynamic broker logger config',
   [ConfigSource.DYNAMIC_BROKER_CONFIG]: 'Dynamic broker config',
   [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 'Dynamic default broker config',
+  [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]: 'Dynamic client metrics subscription config',
   [ConfigSource.STATIC_BROKER_CONFIG]: 'Static broker config',
   [ConfigSource.DEFAULT_CONFIG]: 'Default config',
   [ConfigSource.UNKNOWN]: 'Unknown',
@@ -15,6 +16,7 @@ export const CONFIG_SOURCE_PRIORITY = {
   [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 1,
   [ConfigSource.DYNAMIC_BROKER_CONFIG]: 1,
   [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 1,
+  [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]: 1,
   [ConfigSource.STATIC_BROKER_CONFIG]: 2,
   [ConfigSource.DEFAULT_CONFIG]: 3,
   [ConfigSource.UNKNOWN]: 4,

From f994ef500958e5470011129c93eac21660b0464c Mon Sep 17 00:00:00 2001
From: Dmitry Werner <grimekillah@gmail.com>
Date: Tue, 3 Dec 2024 14:07:47 +0500
Subject: [PATCH 3/3] BE: CVE fixes

fix build
---
 .../src/components/Brokers/Broker/Configs/lib/constants.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
index e681c52be..f5701a893 100644
--- a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
+++ b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
@@ -5,7 +5,8 @@ export const CONFIG_SOURCE_NAME_MAP: Record<ConfigSource, string> = {
   [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 'Dynamic broker logger config',
   [ConfigSource.DYNAMIC_BROKER_CONFIG]: 'Dynamic broker config',
   [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 'Dynamic default broker config',
-  [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]: 'Dynamic client metrics subscription config',
+  [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]:
+    'Dynamic client metrics subscription config',
   [ConfigSource.STATIC_BROKER_CONFIG]: 'Static broker config',
   [ConfigSource.DEFAULT_CONFIG]: 'Default config',
   [ConfigSource.UNKNOWN]: 'Unknown',