-
Notifications
You must be signed in to change notification settings - Fork 4
build: adopt hypertrace shared BOM, version catalog, and java-convention plugin #120
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
43cd165
build: bump to JDK 17 and upgrade service-framework to 0.1.94 for Jet…
suresh-prakash ab014af
build: use Gradle Java toolchain to provision JDK 17
suresh-prakash f24e2ae
build: adopt hypertrace shared BOM and version catalog
suresh-prakash 5da595c
build: prefer non-jakarta aliases for hypertrace framework deps
suresh-prakash 6f6f46a
build: address review feedback — prefer commonLibs and slf4j2 binding
suresh-prakash File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| [versions] | ||
| caffeine = "3.1.8" | ||
| junit-pioneer = "2.3.0" | ||
| hypertrace-config = "0.1.73" | ||
| hypertrace-avro-plugin = "0.5.1" | ||
|
|
||
| [libraries] | ||
| junit-pioneer = { module = "org.junit-pioneer:junit-pioneer", version.ref = "junit-pioneer" } | ||
| 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-config-partitioner-api = { module = "org.hypertrace.config.service:partitioner-config-service-api", version.ref = "hypertrace-config" } | ||
|
|
||
| [plugins] | ||
| hypertrace-avro = { id = "org.hypertrace.avro-plugin", version.ref = "hypertrace-avro-plugin" } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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.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 | ||
| 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.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.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= |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI: no issue with changing this, but with the convention plugin the toolchains will govern the java version. At best, changing this may help caching (which is still important)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also you can keep at 17 if you want, the plugin just defaults to 21
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Acknowledged — kept setup-java at 21 to match the convention plugin's toolchain default for cache hits. Per your follow-up, fine to keep at 17 too; flagged this as a no-op cosmetic if we want to flip back.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noted — keeping at 21 for the moment to keep cache hits aligned with the convention default.