build: address review feedback — prefer commonLibs and slf4j2 binding

suresh-prakash · suresh-prakash · commit 6f6f46ab5ddf · 2026-06-01T19:22:19.000+05:30
- Move shared-catalog deps from localLibs to commonLibs: mockito-core,
  log4j-slf4j2-impl, grpc-netty, hypertrace-grpcutils-context. The BOM
  governs the versions there, so the local catalog only carries deps
  truly outside the shared catalog.
- Switch the log4j binding to log4j-slf4j2-impl (the slf4j2 binding) per
  reviewer note — log4j-slf4j-impl was the slf4j-1.x binding and pulls in
  the wrong API.
- Drop versions for kafka-bom-managed entries (avro, kafka-streams-avro-
  serde, kafka-streams-test-utils) — the kafka-bom platform constrains
  them.

Lockfiles regenerated; resolved versions now follow the BOM (mockito 5.8.0,
log4j-slf4j2-impl 2.25.4) instead of hand-pinned ones.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,17 @@
 [versions]
-mockito = "5.15.2"
-log4j = "2.20.0"
 caffeine = "3.1.8"
 junit-pioneer = "2.3.0"
 hypertrace-config = "0.1.73"
-hypertrace-grpcutils = "0.13.23"
-grpc = "1.68.1"
 hypertrace-avro-plugin = "0.5.1"
 
-[plugins]
-hypertrace-avro = { id = "org.hypertrace.avro-plugin", version.ref = "hypertrace-avro-plugin" }
-
 [libraries]
 junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" }
-mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
-log4j-slf4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" }
 hamcrest-core = { module = "org.hamcrest:hamcrest-core", version = "2.2" }
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
 kafka-streams-avro-serde = { module = "io.confluent:kafka-streams-avro-serde" }
 kafka-streams-test-utils = { module = "org.apache.kafka:kafka-streams-test-utils" }
 avro = { module = "org.apache.avro:avro" }
-hypertrace-grpcutils-context = { module = "org.hypertrace.core.grpcutils:grpc-context-utils", version.ref = "hypertrace-grpcutils" }
 hypertrace-config-partitioner-api = { module = "org.hypertrace.config.service:partitioner-config-service-api", version.ref = "hypertrace-config" }
-grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }
+
+[plugins]
+hypertrace-avro = { id = "org.hypertrace.avro-plugin", version.ref = "hypertrace-avro-plugin" }
diff --git a/kafka-event-listener/build.gradle.kts b/kafka-event-listener/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
   implementation(commonLibs.hypertrace.framework.metrics)
   testImplementation(commonLibs.junit.jupiter)
-  testImplementation(localLibs.mockito.core)
+  testImplementation(commonLibs.mockito.core)
   testImplementation(localLibs.caffeine)
 
   testFixturesApi(platform(project(":kafka-bom")))
diff --git a/kafka-event-listener/gradle.lockfile b/kafka-event-listener/gradle.lockfile
@@ -33,8 +33,8 @@ io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClas
 io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath
 jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.11=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=runtimeClasspath
@@ -59,7 +59,7 @@ org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntim
 org.junit.platform:junit-platform-engine:1.10.0=testRuntimeClasspath
 org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.15.2=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts
@@ -32,9 +32,9 @@ dependencies {
   testImplementation(localLibs.kafka.streams.test.utils)
   testImplementation(commonLibs.junit.jupiter)
   testImplementation(localLibs.junit.pioneer)
-  testImplementation(localLibs.mockito.core)
+  testImplementation(commonLibs.mockito.core)
   testImplementation(localLibs.hamcrest.core)
-  testRuntimeOnly(localLibs.log4j.slf4j.impl)
+  testRuntimeOnly(commonLibs.log4j.slf4j2.impl)
 }
 
 // Disabling compatibility check for the test avro definitions.
diff --git a/kafka-streams-framework/gradle.lockfile b/kafka-streams-framework/gradle.lockfile
@@ -68,8 +68,8 @@ io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClassp
 io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath
 io.swagger.core.v3:swagger-annotations:2.1.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.11=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apache.avro:avro:1.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -78,9 +78,9 @@ org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-streams-test-utils:7.7.0-ccs=testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-streams:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.logging.log4j:log4j-api:2.20.0=testRuntimeClasspath
-org.apache.logging.log4j:log4j-core:2.20.0=testRuntimeClasspath
-org.apache.logging.log4j:log4j-slf4j-impl:2.20.0=testRuntimeClasspath
+org.apache.logging.log4j:log4j-api:2.25.4=testRuntimeClasspath
+org.apache.logging.log4j:log4j-core:2.25.4=testRuntimeClasspath
+org.apache.logging.log4j:log4j-slf4j2-impl:2.25.4=testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath
 org.checkerframework:checker-qual:3.43.0=runtimeClasspath,testRuntimeClasspath
@@ -118,7 +118,7 @@ org.junit.platform:junit-platform-launcher:1.11.2=testRuntimeClasspath
 org.junit:junit-bom:5.10.0=testCompileClasspath
 org.junit:junit-bom:5.11.2=testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.mockito:mockito-core:5.15.2=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath,testCompileClasspath
diff --git a/kafka-streams-partitioners/avro-partitioners/build.gradle.kts b/kafka-streams-partitioners/avro-partitioners/build.gradle.kts
@@ -26,8 +26,8 @@ dependencies {
 
   testImplementation(commonLibs.junit.jupiter)
   testImplementation(localLibs.junit.pioneer)
-  testImplementation(localLibs.mockito.core)
-  testRuntimeOnly(localLibs.log4j.slf4j.impl)
+  testImplementation(commonLibs.mockito.core)
+  testRuntimeOnly(commonLibs.log4j.slf4j2.impl)
 }
 
 // Disabling compatibility check for the test avro definitions.
diff --git a/kafka-streams-partitioners/avro-partitioners/gradle.lockfile b/kafka-streams-partitioners/avro-partitioners/gradle.lockfile
@@ -19,16 +19,16 @@ commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompile
 commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.11=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apache.avro:avro:1.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-compress:1.26.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-streams:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.logging.log4j:log4j-api:2.20.0=testRuntimeClasspath
-org.apache.logging.log4j:log4j-core:2.20.0=testRuntimeClasspath
-org.apache.logging.log4j:log4j-slf4j-impl:2.20.0=testRuntimeClasspath
+org.apache.logging.log4j:log4j-api:2.25.4=testRuntimeClasspath
+org.apache.logging.log4j:log4j-core:2.25.4=testRuntimeClasspath
+org.apache.logging.log4j:log4j-slf4j2-impl:2.25.4=testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -48,11 +48,12 @@ org.junit.platform:junit-platform-engine:1.11.2=testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.11.2=testRuntimeClasspath
 org.junit:junit-bom:5.10.0=testCompileClasspath
 org.junit:junit-bom:5.11.2=testRuntimeClasspath
-org.mockito:mockito-core:5.15.2=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
 org.rocksdb:rocksdbjni:7.9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath
+org.slf4j:slf4j-api:2.0.17=testRuntimeClasspath
 org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath
 empty=
diff --git a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts
@@ -19,13 +19,13 @@ dependencies {
   api(commonLibs.hypertrace.grpcutils.client)
   api(commonLibs.typesafe.config)
   implementation(commonLibs.guava)
-  implementation(localLibs.hypertrace.grpcutils.context)
+  implementation(commonLibs.hypertrace.grpcutils.context)
   implementation(localLibs.hypertrace.config.partitioner.api)
   implementation(commonLibs.slf4j2.api)
 
   testImplementation(commonLibs.junit.jupiter)
   testImplementation(localLibs.junit.pioneer)
-  testImplementation(localLibs.mockito.core)
-  testRuntimeOnly(localLibs.log4j.slf4j.impl)
-  testRuntimeOnly(localLibs.grpc.netty)
+  testImplementation(commonLibs.mockito.core)
+  testRuntimeOnly(commonLibs.log4j.slf4j2.impl)
+  testRuntimeOnly(commonLibs.grpc.netty)
 }
diff --git a/kafka-streams-partitioners/weighted-group-partitioner/gradle.lockfile b/kafka-streams-partitioners/weighted-group-partitioner/gradle.lockfile
@@ -46,13 +46,13 @@ io.netty:netty-transport-native-unix-common:4.1.133.Final=testRuntimeClasspath
 io.netty:netty-transport:4.1.133.Final=testRuntimeClasspath
 io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.15.11=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.15.11=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.kafka:kafka-streams:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.logging.log4j:log4j-api:2.20.0=testRuntimeClasspath
-org.apache.logging.log4j:log4j-core:2.20.0=testRuntimeClasspath
-org.apache.logging.log4j:log4j-slf4j-impl:2.20.0=testRuntimeClasspath
+org.apache.logging.log4j:log4j-api:2.25.4=testRuntimeClasspath
+org.apache.logging.log4j:log4j-core:2.25.4=testRuntimeClasspath
+org.apache.logging.log4j:log4j-slf4j2-impl:2.25.4=testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -76,11 +76,12 @@ org.junit.platform:junit-platform-engine:1.11.2=testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.11.2=testRuntimeClasspath
 org.junit:junit-bom:5.10.0=testCompileClasspath
 org.junit:junit-bom:5.11.2=testRuntimeClasspath
-org.mockito:mockito-core:5.15.2=testCompileClasspath,testRuntimeClasspath
+org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
 org.rocksdb:rocksdbjni:7.9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.17=testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath,testCompileClasspath
 org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath
 empty=

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ dependencies {`
`26`	`26`
`27`	`27`	`testImplementation(commonLibs.junit.jupiter)`
`28`	`28`	`testImplementation(localLibs.junit.pioneer)`
`29`		`- testImplementation(localLibs.mockito.core)`
`30`		`- testRuntimeOnly(localLibs.log4j.slf4j.impl)`
	`29`	`+ testImplementation(commonLibs.mockito.core)`
	`30`	`+ testRuntimeOnly(commonLibs.log4j.slf4j2.impl)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// Disabling compatibility check for the test avro definitions.`