Skip to content

Fix/deps #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025
Merged

Fix/deps #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1da2944
fix(test): use new redpanda docker image
fhussonnois Mar 18, 2025
6e5169f
fix(deps): add support for apache kafka 3.9.0
fhussonnois Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...-api/src/main/java/io/streamthoughts/kafka/connect/filepulse/source/FileObjectOffset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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());
}

/**
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/BytesRecordOffset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -21,7 +20,8 @@ public static BytesRecordOffset empty() {
return new BytesRecordOffset(
-1,
-1,
SystemTime.SYSTEM.milliseconds());
System.currentTimeMillis()
);
}

/**
Expand All @@ -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());
}

/**
Expand Down
11 changes: 6 additions & 5 deletions ...in/java/io/streamthoughts/kafka/connect/filepulse/fs/reader/text/RowFileRecordOffset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...gration-test/java/io/streamthoughts/kafka/connect/filepulse/AbstractKafkaConnectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...tegration-test/java/io/streamthoughts/kafka/connect/filepulse/RedpandaKafkaContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*/
public final class RedpandaKafkaContainer extends GenericContainer<RedpandaKafkaContainer> {

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);

Expand Down
6 changes: 3 additions & 3 deletions docker-compose-debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading