From bdda47b30e77de391de89c4e5f99e774e650e1dd Mon Sep 17 00:00:00 2001
From: Eugene Rubanov <eugene.rubanov@neo4j.com>
Date: Fri, 15 Mar 2024 15:13:43 +0000
Subject: [PATCH 1/2] build: update kafka client

---
 .../kotlin/streams/service/sink/errors/KafkaErrorServiceTest.kt | 2 +-
 pom.xml                                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/src/test/kotlin/streams/service/sink/errors/KafkaErrorServiceTest.kt b/common/src/test/kotlin/streams/service/sink/errors/KafkaErrorServiceTest.kt
index cab6e95d..f1557b31 100644
--- a/common/src/test/kotlin/streams/service/sink/errors/KafkaErrorServiceTest.kt
+++ b/common/src/test/kotlin/streams/service/sink/errors/KafkaErrorServiceTest.kt
@@ -24,7 +24,7 @@ class KafkaErrorServiceTest {
         val counter = AtomicInteger(0)
         Mockito.`when`(producer.send(ArgumentMatchers.any<ProducerRecord<ByteArray, ByteArray>>())).then {
             counter.incrementAndGet()
-            FutureRecordMetadata(null, 0, RecordBatch.NO_TIMESTAMP, 0, 0, 0, SystemTime())
+            FutureRecordMetadata(null, 0, RecordBatch.NO_TIMESTAMP, 0, 0, SystemTime())
         }
         val dlqService = KafkaErrorService(producer, ErrorService.ErrorConfig(fail=false,dlqTopic = "dlqTopic"), { s, e -> })
         dlqService.report(listOf(dlqData()))
diff --git a/pom.xml b/pom.xml
index 53c669fc..fdbf30a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
         <kotlin.version>1.9.10</kotlin.version>
         <kotlin.coroutines.version>1.7.3</kotlin.coroutines.version>
         <neo4j.version>4.4.25</neo4j.version>
-        <kafka.version>2.6.3</kafka.version>
+        <kafka.version>3.7.0</kafka.version>
         <!-- Keep it at 2.14 as future versions cause problems with neo4j procedure framework -->
         <jackson.version>2.14.3</jackson.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>

From 3301078e3055370e01e83143b03fa78ae4f48df2 Mon Sep 17 00:00:00 2001
From: Eugene Rubanov <eugene.rubanov@neo4j.com>
Date: Fri, 15 Mar 2024 16:55:43 +0000
Subject: [PATCH 2/2] build: downgrade kafka client version to 3.4.1

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

diff --git a/pom.xml b/pom.xml
index fdbf30a6..61fe908a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,8 @@
         <kotlin.version>1.9.10</kotlin.version>
         <kotlin.coroutines.version>1.7.3</kotlin.coroutines.version>
         <neo4j.version>4.4.25</neo4j.version>
-        <kafka.version>3.7.0</kafka.version>
+        <!-- 3.4 is the minimum version for CVE-2023-25194 -->
+        <kafka.version>3.4.1</kafka.version>
         <!-- Keep it at 2.14 as future versions cause problems with neo4j procedure framework -->
         <jackson.version>2.14.3</jackson.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>