Skip to content
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.

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

Upgrade to Kafka 3.8 #97

Merged
merged 4 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ subprojects {
dependencies {
val log4jVersion: String by project
"testImplementation"(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion)
"testImplementation"(group = "org.assertj", name = "assertj-core", version = "3.25.3")
"testImplementation"(group = "org.assertj", name = "assertj-core", version = "3.27.2")
}
}
10 changes: 5 additions & 5 deletions fluent-kafka-streams-tests/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("com.github.davidmc24.gradle.plugin.avro") version "1.9.1"
id("com.google.protobuf") version "0.9.1"
id("com.google.protobuf") version "0.9.4"
java
idea // required for protobuf support in intellij
}
Expand All @@ -16,18 +16,18 @@ dependencies {
api(project(":schema-registry-mock"))

val junit5Version: String by project
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junit5Version)
testImplementation(group = "org.apache.avro", name = "avro", version = "1.11.3")
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
testImplementation(group = "org.apache.avro", name = "avro", version = "1.12.0")
val confluentVersion: String by project
testImplementation(group = "io.confluent", name = "kafka-protobuf-provider", version = confluentVersion)
testImplementation(group = "io.confluent", name = "kafka-streams-protobuf-serde", version = confluentVersion)
testImplementation(group = "com.google.protobuf", name = "protobuf-java", version = "3.21.12")
testImplementation(group = "com.google.protobuf", name = "protobuf-java", version = "3.25.5")
}

protobuf {
protoc {
// The artifact spec for the Protobuf Compiler
artifact = "com.google.protobuf:protoc:3.21.12"
artifact = "com.google.protobuf:protoc:3.25.5"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* MIT License
*
* Copyright (c) 2023 bakdata GmbH
* Copyright (c) 2025 bakdata
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -63,22 +63,22 @@ void shouldAddHeaders() {
final List<ProducerRecord<String, String>> records = Lists.newArrayList(this.testTopology.streamOutput());
assertThat(records)
.hasSize(2)
.anySatisfy(record -> {
assertThat(record.key()).isEqualTo("key1");
assertThat(record.value()).isEqualTo("value1");
assertThat(record.timestamp()).isZero();
assertThat(record.headers().toArray())
.anySatisfy(producerRecord -> {
assertThat(producerRecord.key()).isEqualTo("key1");
assertThat(producerRecord.value()).isEqualTo("value1");
assertThat(producerRecord.timestamp()).isZero();
assertThat(producerRecord.headers().toArray())
.hasSize(1)
.anySatisfy(header -> {
assertThat(header.key()).isEqualTo("header1");
assertThat(header.value()).isEqualTo(new byte[]{0});
});
})
.anySatisfy(record -> {
assertThat(record.key()).isEqualTo("key2");
assertThat(record.value()).isEqualTo("value2");
assertThat(record.timestamp()).isEqualTo(1L);
assertThat(record.headers().toArray())
.anySatisfy(producerRecord -> {
assertThat(producerRecord.key()).isEqualTo("key2");
assertThat(producerRecord.value()).isEqualTo("value2");
assertThat(producerRecord.timestamp()).isEqualTo(1L);
assertThat(producerRecord.headers().toArray())
.hasSize(2)
.anySatisfy(header -> {
assertThat(header.key()).isEqualTo("header1");
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version=2.15.1-SNAPSHOT
org.gradle.caching=true
org.gradle.parallel=true
junit5Version=5.10.2
junit5Version=5.11.4
junit4Version=4.13.2
confluentVersion=7.7.0
kafkaVersion=3.7.1
log4jVersion=2.23.1
confluentVersion=7.8.0
kafkaVersion=3.8.1
log4jVersion=2.24.3
org.gradle.jvmargs=-Xmx2048m
2 changes: 1 addition & 1 deletion schema-registry-mock-junit5/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ dependencies {
api(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
api(project(":schema-registry-mock"))

testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junit5Version)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
val confluentVersion: String by project
testImplementation(group = "io.confluent", name = "kafka-protobuf-provider", version = confluentVersion)
}
6 changes: 2 additions & 4 deletions schema-registry-mock/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ dependencies {
"api"(group = "io.confluent", name = "kafka-schema-registry-client", version = confluentVersion)
"api"(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion)

implementation(group = "org.wiremock", name = "wiremock", version = "3.4.2")
// required because other dependencies use different Jackson versions if this library is used in test scope
api(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.15.3")
implementation(group = "org.wiremock", name = "wiremock", version = "3.10.0")

val junit5Version: String by project
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = junit5Version)
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)
testImplementation(group = "io.confluent", name = "kafka-protobuf-provider", version = confluentVersion)
}