Dynamically determine Docker image version

bakdata · Jan 16, 2025 · e4ed210 · e4ed210
1 parent f353ec1
commit e4ed210
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/streams-bootstrap-cli/build.gradle.kts b/streams-bootstrap-cli/build.gradle.kts
@@ -20,7 +20,9 @@ dependencies {
     testImplementation(testFixtures(project(":streams-bootstrap-core")))
     testImplementation(group = "com.ginsberg", name = "junit5-system-exit", version = "1.1.2")
     val confluentVersion: String by project
-    testImplementation(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion)
+    testImplementation(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion) {
+        exclude(group = "org.apache.kafka", module = "kafka-clients")
+    }
     val log4jVersion: String by project
     testImplementation(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion)
 }
diff --git a/streams-bootstrap-core/build.gradle.kts b/streams-bootstrap-core/build.gradle.kts
@@ -11,8 +11,12 @@ dependencies {
     api(group = "org.apache.kafka", name = "kafka-streams", version = kafkaVersion)
     api(group = "org.apache.kafka", name = "kafka-clients", version = kafkaVersion)
     val confluentVersion: String by project
-    implementation(group = "io.confluent", name = "kafka-schema-serializer", version = confluentVersion)
-    api(group = "io.confluent", name = "kafka-schema-registry-client", version = confluentVersion)
+    implementation(group = "io.confluent", name = "kafka-schema-serializer", version = confluentVersion) {
+        exclude(group = "org.apache.kafka", module = "kafka-clients")
+    }
+    api(group = "io.confluent", name = "kafka-schema-registry-client", version = confluentVersion) {
+        exclude(group = "org.apache.kafka", module = "kafka-clients")
+    }
     implementation(
         group = "org.slf4j",
         name = "slf4j-api",
@@ -35,7 +39,9 @@ dependencies {
     val testContainersVersion: String by project
     testFixturesApi(group = "org.testcontainers", name = "junit-jupiter", version = testContainersVersion)
     testFixturesApi(group = "org.testcontainers", name = "kafka", version = testContainersVersion)
-    testImplementation(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion)
+    testImplementation(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion) {
+        exclude(group = "org.apache.kafka", module = "kafka-clients")
+    }
     val log4jVersion: String by project
     testImplementation(group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version = log4jVersion)
 }

diff --git a/streams-bootstrap-core/src/testFixtures/java/com/bakdata/kafka/KafkaTest.java b/streams-bootstrap-core/src/testFixtures/java/com/bakdata/kafka/KafkaTest.java
@@ -25,6 +25,7 @@
 package com.bakdata.kafka;
 
 import io.confluent.kafka.schemaregistry.client.SchemaRegistryClient;
+import org.apache.kafka.common.utils.AppInfoParser;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.kafka.KafkaContainer;
@@ -37,7 +38,8 @@ public abstract class KafkaTest {
     private final KafkaContainer kafkaCluster = newCluster();
 
     public static KafkaContainer newCluster() {
-        return new KafkaContainer(DockerImageName.parse("apache/kafka-native:3.8.1"));
+        return new KafkaContainer(DockerImageName.parse("apache/kafka-native")
+                .withTag(AppInfoParser.getVersion()));
     }
 
     protected KafkaEndpointConfig createEndpointWithoutSchemaRegistry() {