From 85ad9b7796ecffb81faa80ffc0b46532c9a76b0f Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 17:44:48 -0400 Subject: [PATCH 1/6] build: update repos and plugins --- .github/workflows/pr-build.yml | 4 ++-- .github/workflows/pr-test.yml | 8 +++++--- .github/workflows/publish.yml | 10 +++++----- README.md | 2 -- build.gradle.kts | 14 +++++++------- settings.gradle.kts | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 26136e3..d7868b9 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -9,11 +9,11 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{github.event.pull_request.head.ref}} repository: ${{github.event.pull_request.head.repo.full_name}} diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 7ad6d10..b77538e 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -7,11 +7,11 @@ on: jobs: test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -46,7 +46,9 @@ jobs: files: ./**/build/test-results/**/*.xml dependency-check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Dependency Check uses: hypertrace/github-actions/dependency-check@main + with: + nvd-api-key: ${{ secrets.NVD_API_KEY }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 079bc0a..f6a5dab 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,11 +8,11 @@ on: jobs: publish-artifacts: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Set fetch-depth: 0 to fetch commit history and tags for use in version calculation - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -21,6 +21,6 @@ jobs: with: args: publish env: - ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }} - ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }} - ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }} + ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }} + ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }} + ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }} diff --git a/README.md b/README.md index 11672c9..95f3c04 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Kafka streams application framework ###### org.hypertrace.core.kafkastreams.framework -[![CircleCI](https://circleci.com/gh/hypertrace/kafka-streams-framework.svg?style=svg)](https://circleci.com/gh/hypertrace/kafka-streams-framework) - A library to create kafka streams based applications (services) diff --git a/build.gradle.kts b/build.gradle.kts index c06ab13..c688949 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,13 +2,13 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension import org.hypertrace.gradle.publishing.License plugins { - id("org.hypertrace.repository-plugin") version "0.4.2" - id("org.hypertrace.ci-utils-plugin") version "0.3.2" - id("org.hypertrace.avro-plugin") version "0.4.0" apply false - id("org.hypertrace.publish-plugin") version "1.0.5" apply false - id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false - id("org.hypertrace.code-style-plugin") version "2.0.0" apply false - id("org.owasp.dependencycheck") version "8.2.1" + 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.0" 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.0" } subprojects { diff --git a/settings.gradle.kts b/settings.gradle.kts index e9e1ad9..32894ad 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,12 +4,12 @@ pluginManagement { repositories { mavenLocal() gradlePluginPortal() - maven("https://hypertrace.jfrog.io/artifactory/maven") + maven("https://us-maven.pkg.dev/hypertrace-repos/maven") } } plugins { - id("org.hypertrace.version-settings") version "0.2.0" + id("org.hypertrace.version-settings") version "0.3.0" } include(":kafka-streams-framework") From 3dad4584c716214eb24d2eef3633a4e06f5e7930 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 18:43:05 -0400 Subject: [PATCH 2/6] chore: update avro plugin version due to mispublish --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c688949..e7cc1d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ 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.0" apply false + 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 From 635669d4224eaab392e20a8bc02bdca95fbec045 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 18:51:45 -0400 Subject: [PATCH 3/6] ci: fix --- .github/workflows/pr-build.yml | 5 +++++ .github/workflows/pr-test.yml | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index d7868b9..bb48353 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -19,6 +19,11 @@ jobs: repository: ${{github.event.pull_request.head.repo.full_name}} fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - name: Build with Gradle uses: hypertrace/github-actions/gradle@main with: diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index b77538e..00a8e7b 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -15,6 +15,11 @@ jobs: with: fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' + - name: Unit test uses: hypertrace/github-actions/gradle@main with: @@ -48,6 +53,14 @@ jobs: dependency-check: runs-on: ubuntu-24.04 steps: + - name: Check out code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '11' - name: Dependency Check uses: hypertrace/github-actions/dependency-check@main with: From 1c59d3df00b9407df305c9196b3d9fca6fa93134 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 18:53:21 -0400 Subject: [PATCH 4/6] chore: remove checkout --- .github/workflows/pr-test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 00a8e7b..e43917a 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -53,10 +53,6 @@ jobs: dependency-check: runs-on: ubuntu-24.04 steps: - - name: Check out code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - uses: actions/setup-java@v4 with: distribution: 'temurin' From 758888d57fc0d18cd01ab55dea4d3f202044a707 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 19:08:43 -0400 Subject: [PATCH 5/6] chore: update deps --- kafka-event-listener/build.gradle.kts | 2 +- kafka-streams-framework/build.gradle.kts | 6 +++--- .../weighted-group-partitioner/build.gradle.kts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kafka-event-listener/build.gradle.kts b/kafka-event-listener/build.gradle.kts index b7003f6..cb1ac2c 100644 --- a/kafka-event-listener/build.gradle.kts +++ b/kafka-event-listener/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-clients") - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.81") + 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") diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts index f6b76dc..ff4a4b1 100644 --- a/kafka-streams-framework/build.gradle.kts +++ b/kafka-streams-framework/build.gradle.kts @@ -18,12 +18,12 @@ 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.7") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.15") implementation("org.apache.avro:avro") implementation("org.apache.kafka:kafka-clients") - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.81") - implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.81") + implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.89") + implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.89") implementation("org.apache.commons:commons-lang3:3.12.0") testCompileOnly("org.projectlombok:lombok:1.18.26") diff --git a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts index 88589c7..f540eb8 100644 --- a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts +++ b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts @@ -15,11 +15,11 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-streams") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.15") 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.7") - implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.46") + implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.15") + implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.73") implementation("org.slf4j:slf4j-api:1.7.36") testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") From 592b76a1b28bc7dc5c35a0aa1af1aa2a37642e5a Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Thu, 26 Jun 2025 19:41:32 -0400 Subject: [PATCH 6/6] fix: grpc utils ref --- kafka-streams-framework/build.gradle.kts | 2 +- .../weighted-group-partitioner/build.gradle.kts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts index ff4a4b1..692e2a4 100644 --- a/kafka-streams-framework/build.gradle.kts +++ b/kafka-streams-framework/build.gradle.kts @@ -18,7 +18,7 @@ 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.15") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.14") implementation("org.apache.avro:avro") implementation("org.apache.kafka:kafka-clients") diff --git a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts index f540eb8..6c2f360 100644 --- a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts +++ b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts @@ -15,10 +15,10 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-streams") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.15") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.14") 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.15") + implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.14") implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.73") implementation("org.slf4j:slf4j-api:1.7.36")