diff --git a/connect-file-pulse-api/src/main/java/io/streamthoughts/kafka/connect/filepulse/source/FileObjectOffset.java b/connect-file-pulse-api/src/main/java/io/streamthoughts/kafka/connect/filepulse/source/FileObjectOffset.java index be5060b89..f9bedff9b 100644 --- a/connect-file-pulse-api/src/main/java/io/streamthoughts/kafka/connect/filepulse/source/FileObjectOffset.java +++ b/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()); } /** diff --git a/connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/BytesRecordOffset.java b/connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/BytesRecordOffset.java index 373e7282d..ac7f219f9 100644 --- a/connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/BytesRecordOffset.java +++ b/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()); } /** diff --git a/connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/RowFileRecordOffset.java b/connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/RowFileRecordOffset.java index 6bf5621cf..9e1f78c35 100644 --- a/connect-file-pulse-filesystems/filepulse-commons-fs/src/main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/RowFileRecordOffset.java +++ b/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,8 +23,9 @@ public static RowFileRecordOffset empty() { -1, -1, 0, - SystemTime.SYSTEM.milliseconds(), - 0); + System.currentTimeMillis(), + 0 + ); } public static RowFileRecordOffset with(long startPosition, long endPosition) { @@ -33,8 +33,9 @@ public static RowFileRecordOffset with(long startPosition, long endPosition) { startPosition, endPosition, 0, - SystemTime.SYSTEM.milliseconds(), - endPosition - startPosition); + System.currentTimeMillis(), + endPosition - startPosition + ); } /** diff --git a/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/AbstractKafkaConnectTest.java b/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/AbstractKafkaConnectTest.java index 5bcf74123..0d0ef0475 100644 --- a/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/AbstractKafkaConnectTest.java +++ b/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) diff --git a/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/RedpandaKafkaContainer.java b/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/RedpandaKafkaContainer.java index af231e85f..0c3ba36f6 100644 --- a/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/RedpandaKafkaContainer.java +++ b/connect-file-pulse-plugin/src/integration-test/java/io/streamthoughts/kafka/connect/filepulse/RedpandaKafkaContainer.java @@ -28,7 +28,7 @@ */ public final class RedpandaKafkaContainer extends GenericContainer { - public static final String VECTORIZED_REDPANDA_LATEST = "vectorized/redpanda:latest"; + public static final String VECTORIZED_REDPANDA_LATEST = "redpandadata/redpanda:latest"; private static final Logger LOG = LoggerFactory.getLogger(RedpandaKafkaContainer.class); diff --git a/docker-compose-debug.yml b/docker-compose-debug.yml index 7b318c876..9f3e6f242 100644 --- a/docker-compose-debug.yml +++ b/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: diff --git a/docker-compose.yml b/docker-compose.yml index 30f73970b..ae9823071 100644 --- a/docker-compose.yml +++ b/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: diff --git a/docker/Dockerfile b/docker/Dockerfile index 78eea4b2e..bcdf5e681 100644 --- a/docker/Dockerfile +++ b/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 diff --git a/pom.xml b/pom.xml index 9a656ff90..cb9ceead3 100644 --- a/pom.xml +++ b/pom.xml @@ -91,8 +91,8 @@ 1.11.0 https://packages.confluent.io/maven/ - 7.6.0 - 3.7.0 + 7.9.0 + 3.9.0 5.11.0 1.19.7 0.12.0