fix(deps): add support for apache kafka 3.9.0

Author: fhussonnois

connect-file-pulse-api/src/main/java/io/streamthoughts/kafka/connect/filepulse/source/FileObjectOffset.java

@@ -9,7 +9,6 @@
 import com.jsoniter.annotation.JsonCreator;
 import com.jsoniter.annotation.JsonProperty;
 import java.util.Objects;
-import org.apache.kafka.common.utils.SystemTime;
 
 /**
  * An object representing the position of next bytes to read in the input source.
@@ -23,7 +22,7 @@ public class FileObjectOffset {
     private final long timestamp;
 
     public static FileObjectOffset empty() {
-        return new FileObjectOffset(-1, 0, SystemTime.SYSTEM.milliseconds());
+        return new FileObjectOffset(-1, 0, System.currentTimeMillis());
     }
 
     /**

connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/BytesRecordOffset.java

@@ -9,7 +9,6 @@
 import io.streamthoughts.kafka.connect.filepulse.source.FileObjectOffset;
 import io.streamthoughts.kafka.connect.filepulse.source.TimestampedRecordOffset;
 import java.util.Objects;
-import org.apache.kafka.common.utils.SystemTime;
 
 public class BytesRecordOffset extends TimestampedRecordOffset {
 
@@ -21,7 +20,8 @@ public static BytesRecordOffset empty() {
         return new BytesRecordOffset(
                 -1,
                 -1,
-                SystemTime.SYSTEM.milliseconds());
+                System.currentTimeMillis()
+        );
     }
 
     /**
@@ -32,7 +32,7 @@ public static BytesRecordOffset empty() {
      */
     public BytesRecordOffset(long startPosition,
                              long endPosition) {
-        this(startPosition, endPosition, SystemTime.SYSTEM.milliseconds());
+        this(startPosition, endPosition, System.currentTimeMillis());
     }
 
     /**

connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/RowFileRecordOffset.java

@@ -8,7 +8,6 @@
 
 import io.streamthoughts.kafka.connect.filepulse.source.FileObjectOffset;
 import java.util.Objects;
-import org.apache.kafka.common.utils.SystemTime;
 
 /**
  * Represents the position of a record into a text XML file.
@@ -24,17 +23,19 @@ public static RowFileRecordOffset empty() {
                 -1,
                 -1,
                 0,
-                SystemTime.SYSTEM.milliseconds(),
-                0);
+                System.currentTimeMillis(),
+                0
+        );
     }
 
     public static RowFileRecordOffset with(long startPosition, long endPosition) {
         return new RowFileRecordOffset(
                 startPosition,
                 endPosition,
                 0,
-                SystemTime.SYSTEM.milliseconds(),
-                endPosition - startPosition);
+                System.currentTimeMillis(),
+                endPosition - startPosition
+        );
     }
 
     /**

connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/AbstractKafkaConnectTest.java

@@ -55,7 +55,7 @@ public String getConnectWorker() {
     }
 
     private GenericContainer<?> createConnectWorkerContainer() {
-        return new GenericContainer<>(DockerImageName.parse("confluentinc/cp-kafka-connect-base:6.2.1"))
+        return new GenericContainer<>(DockerImageName.parse("confluentinc/cp-kafka-connect-base:7.9.0"))
                 .withLogConsumer(new Slf4jLogConsumer(LOG))
                 .withNetwork(kafka.getKafkaNetwork())
                 .withExposedPorts(CONNECT_PORT)

docker-compose-debug.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   cp-zookeeper:
-    image: confluentinc/cp-zookeeper:7.5.0
+    image: confluentinc/cp-zookeeper:7.9.0
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -13,7 +13,7 @@ services:
       - kafka-connect
 
   cp-kafka:
-    image: confluentinc/cp-kafka:7.5.0
+    image: confluentinc/cp-kafka:7.9.0
     hostname: kafka
     container_name: kafka
     depends_on:
@@ -36,7 +36,7 @@ services:
       - kafka-connect
 
   cp-schema-registry:
-    image: confluentinc/cp-schema-registry:7.5.0
+    image: confluentinc/cp-schema-registry:7.9.0
     hostname: schema-registry
     container_name: schema-registry
     depends_on:

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   cp-zookeeper:
-    image: confluentinc/cp-zookeeper:7.5.0
+    image: confluentinc/cp-zookeeper:7.9.0
     hostname: zookeeper
     container_name: zookeeper
     ports:
@@ -13,7 +13,7 @@ services:
       - kafka-connect
 
   cp-kafka:
-    image: confluentinc/cp-kafka:7.5.0
+    image: confluentinc/cp-kafka:7.9.0
     hostname: kafka
     container_name: kafka
     depends_on:
@@ -36,7 +36,7 @@ services:
       - kafka-connect
 
   cp-schema-registry:
-    image: confluentinc/cp-schema-registry:7.5.0
+    image: confluentinc/cp-schema-registry:7.9.0
     hostname: schema-registry
     container_name: schema-registry
     depends_on:

docker/Dockerfile

@@ -5,7 +5,7 @@
 # Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 #
 # Kafka Connect File Pulse
-FROM confluentinc/cp-kafka-connect-base:7.6.0
+FROM confluentinc/cp-kafka-connect-base:7.9.0
 
 USER root
 

pom.xml

@@ -91,8 +91,8 @@
         <jreleaser-maven-plugin.version>1.11.0</jreleaser-maven-plugin.version>
         <confluent.maven.repo>https://packages.confluent.io/maven/</confluent.maven.repo>
         <!-- DEPENDENCIES -->
-        <io.confluent.version>7.6.0</io.confluent.version>
-        <org.apache.kafka.version>3.7.0</org.apache.kafka.version>
+        <io.confluent.version>7.9.0</io.confluent.version>
+        <org.apache.kafka.version>3.9.0</org.apache.kafka.version>
         <junit.version>5.11.0</junit.version>
         <testcontainer.version>1.19.7</testcontainer.version>
         <kafka.connect.maven.plugin.version>0.12.0</kafka.connect.maven.plugin.version>