From 43cd165f5ff67a26182ef222815adff631e36b17 Mon Sep 17 00:00:00 2001 From: Suresh Prakash Date: Mon, 1 Jun 2026 17:50:38 +0530 Subject: [PATCH 1/5] build: bump to JDK 17 and upgrade service-framework to 0.1.94 for Jetty 12 (CVE-2026-2332) The current build pulls service-framework 0.1.89 (Jetty 11.0.24, vulnerable to CVE-2026-2332 / CVE-2025-5115). service-framework 0.1.94 migrates to Jetty 12.1.9 (ee10), which requires JDK 17+. - Bump source/target compatibility to Java 17 across all subprojects - Bump CI workflows to Java 17 - Bump platform-metrics + platform-service-framework 0.1.89 -> 0.1.94 - Bump grpc-client-utils 0.13.16 -> 0.13.23 (resolution conflict version) - Bump junit-pioneer 2.0.0 -> 2.3.0 and mockito-core 5.2.0 -> 5.15.2 for JDK 17+ reflection compat - Add --add-opens to test task for junit-pioneer @SetEnvironmentVariable on JDK 17+ Co-Authored-By: Claude Opus 4.7 --- .github/workflows/pr-build.yml | 2 +- .github/workflows/pr-test.yml | 4 ++-- build.gradle.kts | 4 ++-- kafka-streams-framework/build.gradle.kts | 14 +++++++++----- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index bb48353..0638d5f 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - name: Build with Gradle uses: hypertrace/github-actions/gradle@main diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index e43917a..4039b16 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - name: Unit test uses: hypertrace/github-actions/gradle@main @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - name: Dependency Check uses: hypertrace/github-actions/dependency-check@main with: diff --git a/build.gradle.kts b/build.gradle.kts index 5013857..5997563 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,8 +21,8 @@ subprojects { pluginManager.withPlugin("java") { configure { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 apply(plugin = "org.hypertrace.code-style-plugin") } diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts index cc9fd3d..52af2a8 100644 --- a/kafka-streams-framework/build.gradle.kts +++ b/kafka-streams-framework/build.gradle.kts @@ -8,6 +8,10 @@ plugins { tasks.test { useJUnitPlatform() + jvmArgs( + "--add-opens=java.base/java.util=ALL-UNNAMED", + "--add-opens=java.base/java.lang=ALL-UNNAMED", + ) } dependencies { @@ -18,20 +22,20 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-streams") api("io.confluent:kafka-streams-avro-serde") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.16") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23") implementation("org.apache.avro:avro") implementation("org.apache.kafka:kafka-clients") - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.89") - implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.89") + implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.94") + implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.94") implementation("org.apache.commons:commons-lang3:3.18.0") testCompileOnly("org.projectlombok:lombok:1.18.38") testAnnotationProcessor("org.projectlombok:lombok:1.18.38") testImplementation("org.apache.kafka:kafka-streams-test-utils") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") - testImplementation("org.junit-pioneer:junit-pioneer:2.0.0") - testImplementation("org.mockito:mockito-core:5.2.0") + testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") + testImplementation("org.mockito:mockito-core:5.15.2") testImplementation("org.hamcrest:hamcrest-core:2.2") testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0") } From ab014af54cc3a06ef4918540c3436a557c654244 Mon Sep 17 00:00:00 2001 From: Suresh Prakash Date: Mon, 1 Jun 2026 18:16:41 +0530 Subject: [PATCH 2/5] build: use Gradle Java toolchain to provision JDK 17 The shared hypertrace gradle GitHub action launches Gradle with JDK 11 on the runner. Setting source/target compatibility to 17 caused 'invalid source release: 17' on subprojects in the build job. Switching to a Java toolchain lets Gradle auto-provision and compile with JDK 17 regardless of the launcher JDK the action uses. --- build.gradle.kts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5997563..fb2d57c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,8 +21,12 @@ subprojects { pluginManager.withPlugin("java") { configure { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + // Use a Gradle toolchain so the build provisions and compiles with JDK 17 + // regardless of the launcher JDK the CI action uses (the shared + // hypertrace gradle action launches with JDK 11). + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } apply(plugin = "org.hypertrace.code-style-plugin") } From f24e2ae7cb2b8553fb02d099d175788059bd260d Mon Sep 17 00:00:00 2001 From: Suresh Prakash Date: Mon, 1 Jun 2026 18:40:09 +0530 Subject: [PATCH 3/5] build: adopt hypertrace shared BOM and version catalog Migrates the project to the canonical hypertrace pattern: the shared hypertrace-bom catalog drives common dep/plugin versions and the java-convention plugin standardizes JVM toolchain handling. Repo-local deps move to gradle/libs.versions.toml exposed as localLibs. - settings.gradle.kts: apply org.hypertrace.dependency-settings 0.2.0 with catalogVersion 0.3.80 (auto-registers commonLibs and localLibs) - gradle/libs.versions.toml: repo-local catalog (mockito, log4j, junit- pioneer, caffeine, avro, hypertrace-config-partitioner-api, grpc-netty, hypertrace-grpcutils-context, plus the avro plugin which is not in BOM) - build.gradle.kts: replace per-module hand-rolled plugin versions with alias(commonLibs.plugins.*); apply hypertrace.java-convention (toolchain 21 default, releaseCompatibility 11) so dep/JDK upgrades come for free via BOM bumps - Subprojects: rewrite to alias(commonLibs.*)/alias(localLibs.*) and add api(platform(commonLibs.hypertrace.bom)) for managed versions - Generate gradle.lockfile per module (settings-gradle.lockfile not tracked per the BOM doc) - Add .github/workflows/update-locks.yml: weekly schedule keeps locks in sync with newly published BOM versions - Bump pr-build/pr-test java-version 17 to 21 to match toolchain default --- .github/workflows/pr-build.yml | 2 +- .github/workflows/pr-test.yml | 4 +- .github/workflows/update-locks.yml | 30 ++++ build.gradle.kts | 29 ++-- gradle/libs.versions.toml | 25 ++++ kafka-event-listener/build.gradle.kts | 21 +-- kafka-event-listener/gradle.lockfile | 69 ++++++++++ kafka-streams-framework/build.gradle.kts | 45 +++--- kafka-streams-framework/gradle.lockfile | 130 ++++++++++++++++++ .../avro-partitioners/build.gradle.kts | 29 ++-- .../avro-partitioners/gradle.lockfile | 58 ++++++++ .../build.gradle.kts | 31 +++-- .../gradle.lockfile | 86 ++++++++++++ kafka-streams-serdes/build.gradle.kts | 13 +- kafka-streams-serdes/gradle.lockfile | 32 +++++ settings.gradle.kts | 7 + 16 files changed, 520 insertions(+), 91 deletions(-) create mode 100644 .github/workflows/update-locks.yml create mode 100644 gradle/libs.versions.toml create mode 100644 kafka-event-listener/gradle.lockfile create mode 100644 kafka-streams-framework/gradle.lockfile create mode 100644 kafka-streams-partitioners/avro-partitioners/gradle.lockfile create mode 100644 kafka-streams-partitioners/weighted-group-partitioner/gradle.lockfile create mode 100644 kafka-streams-serdes/gradle.lockfile diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 0638d5f..b9d0c96 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Build with Gradle uses: hypertrace/github-actions/gradle@main diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 4039b16..8353495 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Unit test uses: hypertrace/github-actions/gradle@main @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Dependency Check uses: hypertrace/github-actions/dependency-check@main with: diff --git a/.github/workflows/update-locks.yml b/.github/workflows/update-locks.yml new file mode 100644 index 0000000..5cf3b48 --- /dev/null +++ b/.github/workflows/update-locks.yml @@ -0,0 +1,30 @@ +name: Update Locks +on: + workflow_dispatch: + schedule: + - cron: '37 21 * * 3' +jobs: + update-versions: + runs-on: ubuntu-24.04 + steps: + - name: Check out code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Calculate simple repository name + id: repo-basename + shell: bash + run: | + echo "value=`basename ${{ github.repository }}`" >> $GITHUB_OUTPUT + - name: Get Token from Github App + uses: tibdex/github-app-token@v2 + id: generate-token + with: + app_id: ${{ secrets.GH_CI_APP_ID }} + private_key: ${{ secrets.GH_CI_APP_PRIVATE_KEY }} + repositories: >- + [${{ toJson(steps.repo-basename.outputs.value) }}] + - name: Update locks if needed + uses: hypertrace/github-actions/raise-lock-pr@main + with: + token: ${{ steps.generate-token.outputs.token }} diff --git a/build.gradle.kts b/build.gradle.kts index fb2d57c..c8b1fb9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,34 +2,25 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension import org.hypertrace.gradle.publishing.License plugins { - id("org.hypertrace.repository-plugin") version "0.5.0" - id("org.hypertrace.ci-utils-plugin") version "0.4.0" - id("org.hypertrace.avro-plugin") version "0.5.1" apply false - id("org.hypertrace.publish-plugin") version "1.1.1" apply false - id("org.hypertrace.jacoco-report-plugin") version "0.3.0" apply false - id("org.hypertrace.code-style-plugin") version "2.1.2" apply false - id("org.owasp.dependencycheck") version "12.1.3" + alias(commonLibs.plugins.hypertrace.repository) + alias(commonLibs.plugins.hypertrace.ciutils) + alias(commonLibs.plugins.hypertrace.publish) apply false + alias(commonLibs.plugins.hypertrace.codestyle) apply false + alias(commonLibs.plugins.hypertrace.java.convention) + alias(commonLibs.plugins.owasp.dependencycheck) + alias(localLibs.plugins.hypertrace.avro) apply false } subprojects { group = "org.hypertrace.core.kafkastreams.framework" - pluginManager.withPlugin("org.hypertrace.publish-plugin") { + pluginManager.withPlugin(rootProject.commonLibs.plugins.hypertrace.publish.get().pluginId) { configure { license.set(License.APACHE_2_0) } } pluginManager.withPlugin("java") { - configure { - // Use a Gradle toolchain so the build provisions and compiles with JDK 17 - // regardless of the launcher JDK the CI action uses (the shared - // hypertrace gradle action launches with JDK 11). - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } - - apply(plugin = "org.hypertrace.code-style-plugin") - } + apply(plugin = rootProject.commonLibs.plugins.hypertrace.codestyle.get().pluginId) } // Handle lz4-java redirect capability conflict: @@ -49,4 +40,4 @@ dependencyCheck { suppressionFile = "owasp-suppressions.xml" scanConfigurations.add("runtimeClasspath") failBuildOnCVSS = 3.0F -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..bf2870a --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,25 @@ +[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" } diff --git a/kafka-event-listener/build.gradle.kts b/kafka-event-listener/build.gradle.kts index 29a095f..f12a082 100644 --- a/kafka-event-listener/build.gradle.kts +++ b/kafka-event-listener/build.gradle.kts @@ -1,25 +1,26 @@ plugins { `java-library` jacoco - id("org.hypertrace.publish-plugin") - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.publish) + alias(commonLibs.plugins.hypertrace.jacoco) id("java-test-fixtures") } dependencies { - annotationProcessor("org.projectlombok:lombok:1.18.38") - compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) api(platform(project(":kafka-bom"))) - api("org.apache.kafka:kafka-clients") + api(platform(commonLibs.hypertrace.bom)) + api(commonLibs.kafka.clients) - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.89") - testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") - testImplementation("org.mockito:mockito-core:5.2.0") - testImplementation("com.github.ben-manes.caffeine:caffeine:3.1.8") + implementation(commonLibs.hypertrace.framework.metrics.jakarta) + testImplementation(commonLibs.junit.jupiter) + testImplementation(localLibs.mockito.core) + testImplementation(localLibs.caffeine) testFixturesApi(platform(project(":kafka-bom"))) - testFixturesApi("org.apache.kafka:kafka-clients") + testFixturesApi(commonLibs.kafka.clients) } tasks.test { diff --git a/kafka-event-listener/gradle.lockfile b/kafka-event-listener/gradle.lockfile new file mode 100644 index 0000000..b62caf6 --- /dev/null +++ b/kafka-event-listener/gradle.lockfile @@ -0,0 +1,69 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +at.yawk.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.ben-manes.caffeine:caffeine:3.1.8=testCompileClasspath,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava-parent:32.1.2-jre=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava:32.1.2-jre=runtimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testRuntimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-jakarta-servlet:4.2.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-jvm:4.2.25=runtimeClasspath,testRuntimeClasspath +io.github.mweirauch:micrometer-jvm-extras:0.2.2=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_pushgateway:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_servlet_common:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath +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 +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 +org.checkerframework:checker-qual:3.37.0=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=runtimeClasspath,testRuntimeClasspath +org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.serviceframework:platform-metrics:0.1.94=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath +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.objenesis:objenesis:3.3=testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath +empty= diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts index 52af2a8..24da9c5 100644 --- a/kafka-streams-framework/build.gradle.kts +++ b/kafka-streams-framework/build.gradle.kts @@ -1,43 +1,40 @@ plugins { `java-library` jacoco - id("org.hypertrace.publish-plugin") - id("org.hypertrace.jacoco-report-plugin") - id("org.hypertrace.avro-plugin") + alias(commonLibs.plugins.hypertrace.publish) + alias(commonLibs.plugins.hypertrace.jacoco) + alias(localLibs.plugins.hypertrace.avro) } tasks.test { useJUnitPlatform() - jvmArgs( - "--add-opens=java.base/java.util=ALL-UNNAMED", - "--add-opens=java.base/java.lang=ALL-UNNAMED", - ) } dependencies { - annotationProcessor("org.projectlombok:lombok:1.18.38") - compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) api(project(":kafka-streams-serdes")) api(platform(project(":kafka-bom"))) + api(platform(commonLibs.hypertrace.bom)) api("org.apache.kafka:kafka-streams") - api("io.confluent:kafka-streams-avro-serde") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23") + api(localLibs.kafka.streams.avro.serde) + api(commonLibs.hypertrace.grpcutils.client) - implementation("org.apache.avro:avro") - implementation("org.apache.kafka:kafka-clients") - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.94") - implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.94") - implementation("org.apache.commons:commons-lang3:3.18.0") + implementation(localLibs.avro) + implementation(commonLibs.kafka.clients) + implementation(commonLibs.hypertrace.framework.metrics.jakarta) + implementation(commonLibs.hypertrace.framework.service.jakarta) + implementation(commonLibs.commons.lang) - testCompileOnly("org.projectlombok:lombok:1.18.38") - testAnnotationProcessor("org.projectlombok:lombok:1.18.38") - testImplementation("org.apache.kafka:kafka-streams-test-utils") - testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") - testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") - testImplementation("org.mockito:mockito-core:5.15.2") - testImplementation("org.hamcrest:hamcrest-core:2.2") - testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0") + testCompileOnly(commonLibs.lombok) + testAnnotationProcessor(commonLibs.lombok) + testImplementation(localLibs.kafka.streams.test.utils) + testImplementation(commonLibs.junit.jupiter) + testImplementation(localLibs.junit.pioneer) + testImplementation(localLibs.mockito.core) + testImplementation(localLibs.hamcrest.core) + testRuntimeOnly(localLibs.log4j.slf4j.impl) } // Disabling compatibility check for the test avro definitions. diff --git a/kafka-streams-framework/gradle.lockfile b/kafka-streams-framework/gradle.lockfile new file mode 100644 index 0000000..90daa4a --- /dev/null +++ b/kafka-streams-framework/gradle.lockfile @@ -0,0 +1,130 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +at.yawk.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.4.0=runtimeClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath,testRuntimeClasspath +com.eclipsesource.minimal-json:minimal-json:0.9.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.1=runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.30.0=compileClasspath,testCompileClasspath +com.google.errorprone:error_prone_annotations:2.38.0=runtimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,testCompileClasspath +com.google.guava:failureaccess:1.0.2=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,testCompileClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,testCompileClasspath +com.google.guava:guava:33.3.1-android=runtimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.25.8=runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=runtimeClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.helger:profiler:1.1.1=runtimeClasspath,testRuntimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath +io.confluent:common-utils:7.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.confluent:kafka-avro-serializer:7.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.confluent:kafka-schema-registry-client:7.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.confluent:kafka-schema-serializer:7.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.confluent:kafka-streams-avro-serde:7.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.confluent:logredactor-metrics:1.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.confluent:logredactor:1.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-healthchecks:4.2.25=runtimeClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-jakarta-servlet:4.2.25=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-jakarta-servlets:4.2.25=runtimeClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-json:4.2.25=runtimeClasspath,testRuntimeClasspath +io.dropwizard.metrics:metrics-jvm:4.2.25=runtimeClasspath,testRuntimeClasspath +io.github.mweirauch:micrometer-jvm-extras:0.2.2=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.75.0=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-core:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.14.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_common:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_dropwizard:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_pushgateway:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_servlet_common:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_servlet_jakarta:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath,testRuntimeClasspath +io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClasspath +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 +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.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath +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.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 +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.9=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.9=runtimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:2.2=testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.13.23=runtimeClasspath,testRuntimeClasspath +org.hypertrace.core.serviceframework:platform-metrics:0.1.94=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.serviceframework:platform-service-framework:0.1.94=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.serviceframework:service-framework-spi:0.1.94=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit-pioneer:junit-pioneer:2.3.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.11.2=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.11.2=testRuntimeClasspath +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.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.15.2=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 +org.rocksdb:rocksdbjni:7.9.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.13=compileClasspath,testCompileClasspath +org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty= diff --git a/kafka-streams-partitioners/avro-partitioners/build.gradle.kts b/kafka-streams-partitioners/avro-partitioners/build.gradle.kts index c23b8ea..b4cfff4 100644 --- a/kafka-streams-partitioners/avro-partitioners/build.gradle.kts +++ b/kafka-streams-partitioners/avro-partitioners/build.gradle.kts @@ -1,9 +1,9 @@ plugins { `java-library` jacoco - id("org.hypertrace.avro-plugin") - id("org.hypertrace.publish-plugin") - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.publish) + alias(commonLibs.plugins.hypertrace.jacoco) + alias(localLibs.plugins.hypertrace.avro) } tasks.test { @@ -12,21 +12,22 @@ tasks.test { dependencies { api(platform(project(":kafka-bom"))) + api(platform(commonLibs.hypertrace.bom)) - annotationProcessor("org.projectlombok:lombok:1.18.38") - compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - implementation("com.google.guava:guava:32.0.1-jre") - implementation("org.apache.avro:avro") - implementation("com.typesafe:config:1.4.2") - implementation("org.apache.kafka:kafka-clients") + implementation(commonLibs.guava) + implementation(localLibs.avro) + implementation(commonLibs.typesafe.config) + implementation(commonLibs.kafka.clients) implementation("org.apache.kafka:kafka-streams") - implementation("org.slf4j:slf4j-api:1.7.36") + implementation(commonLibs.slf4j2.api) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.junit-pioneer:junit-pioneer:1.7.1") - testImplementation("org.mockito:mockito-core:4.5.1") - testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2") + testImplementation(commonLibs.junit.jupiter) + testImplementation(localLibs.junit.pioneer) + testImplementation(localLibs.mockito.core) + testRuntimeOnly(localLibs.log4j.slf4j.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 new file mode 100644 index 0000000..95db532 --- /dev/null +++ b/kafka-streams-partitioners/avro-partitioners/gradle.lockfile @@ -0,0 +1,58 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +at.yawk.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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 +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.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 +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit-pioneer:junit-pioneer:2.3.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.11.2=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.11.2=testRuntimeClasspath +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.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.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 index 572cd71..1eb6aca 100644 --- a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts +++ b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts @@ -1,8 +1,8 @@ plugins { `java-library` jacoco - id("org.hypertrace.publish-plugin") - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.publish) + alias(commonLibs.plugins.hypertrace.jacoco) } tasks.test { @@ -10,21 +10,22 @@ tasks.test { } dependencies { - annotationProcessor("org.projectlombok:lombok:1.18.38") - compileOnly("org.projectlombok:lombok:1.18.38") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) api(platform(project(":kafka-bom"))) + api(platform(commonLibs.hypertrace.bom)) api("org.apache.kafka:kafka-streams") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.16") - api("com.typesafe:config:1.4.2") - implementation("com.google.guava:guava:32.0.1-jre") - implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.16") - implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.73") - implementation("org.slf4j:slf4j-api:1.7.36") + api(commonLibs.hypertrace.grpcutils.client) + api(commonLibs.typesafe.config) + implementation(commonLibs.guava) + implementation(localLibs.hypertrace.grpcutils.context) + implementation(localLibs.hypertrace.config.partitioner.api) + implementation(commonLibs.slf4j2.api) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.junit-pioneer:junit-pioneer:1.7.1") - testImplementation("org.mockito:mockito-core:4.5.1") - testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2") - testRuntimeOnly("io.grpc:grpc-netty:1.68.1") + testImplementation(commonLibs.junit.jupiter) + testImplementation(localLibs.junit.pioneer) + testImplementation(localLibs.mockito.core) + testRuntimeOnly(localLibs.log4j.slf4j.impl) + testRuntimeOnly(localLibs.grpc.netty) } diff --git a/kafka-streams-partitioners/weighted-group-partitioner/gradle.lockfile b/kafka-streams-partitioners/weighted-group-partitioner/gradle.lockfile new file mode 100644 index 0000000..40146bf --- /dev/null +++ b/kafka-streams-partitioners/weighted-group-partitioner/gradle.lockfile @@ -0,0 +1,86 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +at.yawk.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.4.0=runtimeClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.1=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.1=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath,testRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.59.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.1=runtimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.30.0=compileClasspath,testCompileClasspath +com.google.errorprone:error_prone_annotations:2.38.0=runtimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.3.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.25.8=runtimeClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.75.0=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty:1.75.0=testRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.75.0=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-protobuf:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-util:1.75.0=testRuntimeClasspath +io.netty:netty-bom:4.1.133.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.133.Final=testRuntimeClasspath +io.netty:netty-codec-http2:4.1.133.Final=testRuntimeClasspath +io.netty:netty-codec-http:4.1.133.Final=testRuntimeClasspath +io.netty:netty-codec-socks:4.1.133.Final=testRuntimeClasspath +io.netty:netty-codec:4.1.133.Final=testRuntimeClasspath +io.netty:netty-common:4.1.133.Final=testRuntimeClasspath +io.netty:netty-handler-proxy:4.1.133.Final=testRuntimeClasspath +io.netty:netty-handler:4.1.133.Final=testRuntimeClasspath +io.netty:netty-resolver:4.1.133.Final=testRuntimeClasspath +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 +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.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 +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.config.service:partitioner-config-service-api:0.1.73=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.13.23=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit-pioneer:junit-pioneer:2.3.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.11.2=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.11.2=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.11.2=testRuntimeClasspath +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.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.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath +empty= diff --git a/kafka-streams-serdes/build.gradle.kts b/kafka-streams-serdes/build.gradle.kts index 3dfc3f8..31cd8d2 100644 --- a/kafka-streams-serdes/build.gradle.kts +++ b/kafka-streams-serdes/build.gradle.kts @@ -1,9 +1,9 @@ plugins { `java-library` jacoco - id("org.hypertrace.avro-plugin") - id("org.hypertrace.publish-plugin") - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.publish) + alias(commonLibs.plugins.hypertrace.jacoco) + alias(localLibs.plugins.hypertrace.avro) } tasks.test { @@ -12,11 +12,12 @@ tasks.test { dependencies { api(platform(project(":kafka-bom"))) + api(platform(commonLibs.hypertrace.bom)) - api("org.apache.kafka:kafka-clients") - api("org.apache.avro:avro") + api(commonLibs.kafka.clients) + api(localLibs.avro) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") + testImplementation(commonLibs.junit.jupiter) } // Disabling compatibility check for the test avro definitions. diff --git a/kafka-streams-serdes/gradle.lockfile b/kafka-streams-serdes/gradle.lockfile new file mode 100644 index 0000000..999404e --- /dev/null +++ b/kafka-streams-serdes/gradle.lockfile @@ -0,0 +1,32 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +at.yawk.lz4:lz4-java:1.8.1=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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 +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.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.eclipse.jetty.ee10:jetty-ee10-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:12.1.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.80=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.0=testRuntimeClasspath +org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath,testRuntimeClasspath +empty=annotationProcessor diff --git a/settings.gradle.kts b/settings.gradle.kts index 32894ad..9f30bdf 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ +import org.hypertrace.gradle.dependency.DependencyPluginSettingExtension + rootProject.name = "kafka-streams-framework" pluginManagement { @@ -10,6 +12,11 @@ pluginManagement { plugins { id("org.hypertrace.version-settings") version "0.3.0" + id("org.hypertrace.dependency-settings") version "0.2.0" +} + +configure { + catalogVersion.set("0.3.80") } include(":kafka-streams-framework") From 5da595c66332b713b60fe7971f9309ac0ef804f6 Mon Sep 17 00:00:00 2001 From: Suresh Prakash Date: Mon, 1 Jun 2026 18:43:46 +0530 Subject: [PATCH 4/5] build: prefer non-jakarta aliases for hypertrace framework deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both `hypertrace.framework.metrics` and `hypertrace.framework.metrics.jakarta` (and the same pair for `service`) resolve to the same underlying artifact in hypertrace-bom 0.3.80 — the `-jakarta` suffix is a transitional alias for the in-flight Jakarta EE migration. The unsuffixed names are clearer and self- explanatory; switch to those. No resolved-dependency change; lockfiles unchanged. --- kafka-event-listener/build.gradle.kts | 2 +- kafka-streams-framework/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kafka-event-listener/build.gradle.kts b/kafka-event-listener/build.gradle.kts index f12a082..2464980 100644 --- a/kafka-event-listener/build.gradle.kts +++ b/kafka-event-listener/build.gradle.kts @@ -14,7 +14,7 @@ dependencies { api(platform(commonLibs.hypertrace.bom)) api(commonLibs.kafka.clients) - implementation(commonLibs.hypertrace.framework.metrics.jakarta) + implementation(commonLibs.hypertrace.framework.metrics) testImplementation(commonLibs.junit.jupiter) testImplementation(localLibs.mockito.core) testImplementation(localLibs.caffeine) diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts index 24da9c5..7967fbc 100644 --- a/kafka-streams-framework/build.gradle.kts +++ b/kafka-streams-framework/build.gradle.kts @@ -23,8 +23,8 @@ dependencies { implementation(localLibs.avro) implementation(commonLibs.kafka.clients) - implementation(commonLibs.hypertrace.framework.metrics.jakarta) - implementation(commonLibs.hypertrace.framework.service.jakarta) + implementation(commonLibs.hypertrace.framework.metrics) + implementation(commonLibs.hypertrace.framework.service) implementation(commonLibs.commons.lang) testCompileOnly(commonLibs.lombok) From 6f6f46ab5ddf0dfc00b3b77e17fc8d080471772a Mon Sep 17 00:00:00 2001 From: Suresh Prakash Date: Mon, 1 Jun 2026 19:22:19 +0530 Subject: [PATCH 5/5] =?UTF-8?q?build:=20address=20review=20feedback=20?= =?UTF-8?q?=E2=80=94=20prefer=20commonLibs=20and=20slf4j2=20binding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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. --- gradle/libs.versions.toml | 14 +++----------- kafka-event-listener/build.gradle.kts | 2 +- kafka-event-listener/gradle.lockfile | 6 +++--- kafka-streams-framework/build.gradle.kts | 4 ++-- kafka-streams-framework/gradle.lockfile | 12 ++++++------ .../avro-partitioners/build.gradle.kts | 4 ++-- .../avro-partitioners/gradle.lockfile | 15 ++++++++------- .../weighted-group-partitioner/build.gradle.kts | 8 ++++---- .../weighted-group-partitioner/gradle.lockfile | 15 ++++++++------- 9 files changed, 37 insertions(+), 43 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bf2870a..ef8f14b 100644 --- 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 index 2464980..119284c 100644 --- 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 index b62caf6..07b3cf1 100644 --- 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 index 7967fbc..dcdbf36 100644 --- 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 index 90daa4a..e1efd02 100644 --- 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 index b4cfff4..cfb4d21 100644 --- 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 index 95db532..b85fb07 100644 --- 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 index 1eb6aca..f89277e 100644 --- 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 index 40146bf..54cfa84 100644 --- 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=