Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@ 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}}
fetch-depth: 0

- uses: actions/setup-java@v4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This repo has some incompatibilities with later versions of java that need to be fixed. Default java version moves to 17 as of ubuntu 24.04

with:
distribution: 'temurin'
java-version: '11'

- name: Build with Gradle
uses: hypertrace/github-actions/gradle@main
with:
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,19 @@ 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

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'

- name: Unit test
uses: hypertrace/github-actions/gradle@main
with:
Expand Down Expand Up @@ -46,7 +51,13 @@ jobs:
files: ./**/build/test-results/**/*.xml

dependency-check:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
- name: Dependency Check
uses: hypertrace/github-actions/dependency-check@main
with:
nvd-api-key: ${{ secrets.NVD_API_KEY }}
10 changes: 5 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 }}
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.0"
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion kafka-event-listener/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions kafka-streams-framework/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.14")

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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.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.7")
implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.46")
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")

testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down