From dc50c8edf8f627ff5557c672385e52f377b7e1b2 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Mon, 6 Nov 2023 10:41:40 +0100 Subject: [PATCH 1/5] Upgrade to Kafka 3.5 --- azure-pipelines.yml | 1 + gradle.properties | 6 +++--- streams-bootstrap/build.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 989872b1..dedb2ddf 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,6 +19,7 @@ resources: - repository: templates type: github name: bakdata/bakdata-project-templates + ref: tmp/upload-snapshot endpoint: bot jobs: diff --git a/gradle.properties b/gradle.properties index d386fc84..d95b5fed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ version=2.14.1-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true -kafkaVersion=3.4.0 -confluentVersion=7.4.0 -fluentKafkaVersion=2.10.0 +kafkaVersion=3.5.1 +confluentVersion=7.5.1 +fluentKafkaVersion=2.10.1-SNAPSHOT org.gradle.jvmargs=-Xmx2048m diff --git a/streams-bootstrap/build.gradle.kts b/streams-bootstrap/build.gradle.kts index 93b41441..b0a926e3 100644 --- a/streams-bootstrap/build.gradle.kts +++ b/streams-bootstrap/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { name = "schema-registry-mock-junit5", version = fluentKafkaVersion ) - testImplementation(group = "net.mguenther.kafka", name = "kafka-junit", version = "3.4.0") { + testImplementation(group = "net.mguenther.kafka", name = "kafka-junit", version = "3.5.0") { exclude(group = "org.slf4j", module = "slf4j-log4j12") } From 8990033d095e75daf0f78876716e18f93741d2df Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Mon, 6 Nov 2023 10:51:04 +0100 Subject: [PATCH 2/5] Upgrade to Kafka 3.5 --- streams-bootstrap/build.gradle.kts | 2 +- .../src/main/java/com/bakdata/kafka/CleanUpRunner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/streams-bootstrap/build.gradle.kts b/streams-bootstrap/build.gradle.kts index b0a926e3..a0c286c9 100644 --- a/streams-bootstrap/build.gradle.kts +++ b/streams-bootstrap/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { val kafkaVersion: String by project - implementation(group = "org.apache.kafka", name = "kafka_2.13", version = kafkaVersion) + implementation(group = "org.apache.kafka", name = "kafka-tools", version = kafkaVersion) implementation(group = "info.picocli", name = "picocli", version = "4.7.0") api(group = "org.apache.kafka", name = "kafka-streams", version = kafkaVersion) diff --git a/streams-bootstrap/src/main/java/com/bakdata/kafka/CleanUpRunner.java b/streams-bootstrap/src/main/java/com/bakdata/kafka/CleanUpRunner.java index 0c75a648..1a6b0451 100644 --- a/streams-bootstrap/src/main/java/com/bakdata/kafka/CleanUpRunner.java +++ b/streams-bootstrap/src/main/java/com/bakdata/kafka/CleanUpRunner.java @@ -41,13 +41,13 @@ import java.util.Properties; import java.util.function.Consumer; import java.util.stream.Collectors; -import kafka.tools.StreamsResetter; import lombok.Builder; import lombok.Getter; import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.streams.KafkaStreams; import org.apache.kafka.streams.Topology; +import org.apache.kafka.tools.StreamsResetter; /** From eeac4d024eb9432f9fc0bc4c757ccd85f4b9ab4b Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Mon, 6 Nov 2023 11:50:38 +0100 Subject: [PATCH 3/5] Upgrade to Kafka 3.5 --- streams-bootstrap/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/streams-bootstrap/build.gradle.kts b/streams-bootstrap/build.gradle.kts index a0c286c9..910f03bd 100644 --- a/streams-bootstrap/build.gradle.kts +++ b/streams-bootstrap/build.gradle.kts @@ -32,6 +32,11 @@ dependencies { val fluentKafkaVersion: String by project testImplementation(project(":streams-bootstrap-test")) + testImplementation(group = "org.slf4j", name = "slf4j-api") { + version { + strictly("1.7.36") + } + } testImplementation(group = "org.apache.kafka", name = "kafka-streams-test-utils", version = kafkaVersion) testImplementation( group = "com.bakdata.fluent-kafka-streams-tests", From db1d701f1bca34a762e20bca3fd1ed281be761e7 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Tue, 7 Nov 2023 12:33:24 +0100 Subject: [PATCH 4/5] Upgrade to Kafka 3.5 --- streams-bootstrap/build.gradle.kts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/streams-bootstrap/build.gradle.kts b/streams-bootstrap/build.gradle.kts index 910f03bd..08eed058 100644 --- a/streams-bootstrap/build.gradle.kts +++ b/streams-bootstrap/build.gradle.kts @@ -14,9 +14,9 @@ dependencies { val confluentVersion: String by project implementation(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion) api(group = "io.confluent", name = "kafka-schema-registry-client", version = confluentVersion) - val log4jVersion = "2.19.0" + val log4jVersion = "2.21.1" implementation(group = "org.apache.logging.log4j", name = "log4j-core", version = log4jVersion) - implementation(group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version = log4jVersion) + implementation(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion) implementation(group = "com.google.guava", name = "guava", version = "31.1-jre") implementation(group = "org.jooq", name = "jool", version = "0.9.14") @@ -32,11 +32,6 @@ dependencies { val fluentKafkaVersion: String by project testImplementation(project(":streams-bootstrap-test")) - testImplementation(group = "org.slf4j", name = "slf4j-api") { - version { - strictly("1.7.36") - } - } testImplementation(group = "org.apache.kafka", name = "kafka-streams-test-utils", version = kafkaVersion) testImplementation( group = "com.bakdata.fluent-kafka-streams-tests", From 6e8a433d3be69080eb7eacf869dc85f7759e551b Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Fri, 10 Nov 2023 08:26:18 +0100 Subject: [PATCH 5/5] Upgrade to Kafka 3.5 --- azure-pipelines.yml | 1 - gradle.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dedb2ddf..989872b1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,6 @@ resources: - repository: templates type: github name: bakdata/bakdata-project-templates - ref: tmp/upload-snapshot endpoint: bot jobs: diff --git a/gradle.properties b/gradle.properties index d95b5fed..4e8a6d2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.caching=true org.gradle.parallel=true kafkaVersion=3.5.1 confluentVersion=7.5.1 -fluentKafkaVersion=2.10.1-SNAPSHOT +fluentKafkaVersion=2.11.0 org.gradle.jvmargs=-Xmx2048m