chore: update to use bom #121
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| name: Update Locks | ||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| - cron: '18 22 * * 1' | ||
| 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 |
|---|---|---|
| @@ -1,17 +1,16 @@ | ||
| plugins { | ||
| `java-library` | ||
| jacoco | ||
| alias(commonLibs.plugins.hypertrace.publish) | ||
| alias(commonLibs.plugins.hypertrace.jacoco) | ||
| } | ||
|
|
||
| dependencies { | ||
| annotationProcessor(commonLibs.lombok) | ||
| compileOnly(commonLibs.lombok) | ||
|
|
||
| api(commonLibs.hypertrace.documentstore) | ||
| api(projects.serviceFrameworkSpi) | ||
| implementation(projects.platformMetrics) | ||
| implementation(commonLibs.guava) | ||
| } |
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,64 @@ | ||
| # 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. | ||
| com.fasterxml.jackson.core:jackson-annotations:2.16.1=runtimeClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-core:2.16.1=runtimeClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-databind:2.16.1=runtimeClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,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-logging:commons-logging:1.2=runtimeClasspath,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.68.3=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.118.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.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath | ||
| org.apache.commons:commons-collections4:4.4=runtimeClasspath,testRuntimeClasspath | ||
| org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath,testRuntimeClasspath | ||
| org.apache.commons:commons-lang3:3.18.0=runtimeClasspath,testRuntimeClasspath | ||
| org.apache.commons:commons-pool2:2.10.0=runtimeClasspath,testRuntimeClasspath | ||
| org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-http:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-io:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-security:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath | ||
| org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath | ||
| org.mongodb:bson-record-codec:5.2.0=runtimeClasspath,testRuntimeClasspath | ||
| org.mongodb:bson:5.2.0=runtimeClasspath,testRuntimeClasspath | ||
| org.mongodb:mongodb-driver-core:5.2.0=runtimeClasspath,testRuntimeClasspath | ||
| org.mongodb:mongodb-driver-sync:5.2.0=runtimeClasspath,testRuntimeClasspath | ||
| org.postgresql:postgresql:42.5.5=runtimeClasspath,testRuntimeClasspath | ||
| org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath | ||
| org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath | ||
| org.slf4j:slf4j-api:2.0.9=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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,32 @@ | ||
| [versions] | ||
| hypertrace-grpcutils = "0.13.14" | ||
| jetty = "11.0.24" | ||
| guice = "7.0.0" | ||
| dropwizard-metrics = "4.2.25" | ||
| micrometer = "1.14.4" | ||
| prometheus-simpleclient = "0.16.0" | ||
| caffeine = "3.1.8" | ||
|
|
||
| [libraries] | ||
| awaitility = { module = "org.awaitility:awaitility", version = "4.0.3" } | ||
| hypertrace-grpcutils-server = { module = "org.hypertrace.core.grpcutils:grpc-server-utils", version.ref = "hypertrace-grpcutils" } | ||
| grpc-services = { module = "io.grpc:grpc-services" } | ||
| jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.0.0" } | ||
| dropwizard-metrics-jakarta-servlet = { module = "io.dropwizard.metrics:metrics-jakarta-servlet", version.ref = "dropwizard-metrics" } | ||
| dropwizard-metrics-jakarta-servlets = { module = "io.dropwizard.metrics:metrics-jakarta-servlets", version.ref = "dropwizard-metrics" } | ||
| dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" } | ||
| micrometer-core = { module = "io.micrometer:micrometer-core", version.ref = "micrometer" } | ||
| micrometer-registry-prometheus-simpleclient = { module = "io.micrometer:micrometer-registry-prometheus-simpleclient", version.ref = "micrometer" } | ||
| micrometer-jvm-extras = { module = "io.github.mweirauch:micrometer-jvm-extras", version = "0.2.2" } | ||
| prometheus-simpleclient-dropwizard = { module = "io.prometheus:simpleclient_dropwizard", version.ref = "prometheus-simpleclient" } | ||
| prometheus-simpleclient-servlet-jakarta = { module = "io.prometheus:simpleclient_servlet_jakarta", version.ref = "prometheus-simpleclient" } | ||
| prometheus-simpleclient-pushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus-simpleclient" } | ||
| jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" } | ||
| jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" } | ||
| jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "jetty" } | ||
| caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" } | ||
| guice-servlet = { module = "com.google.inject.extensions:guice-servlet", version.ref = "guice" } | ||
| apache-httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" } | ||
|
|
||
| [plugins] | ||
| hypertrace-java-convention = { id = "org.hypertrace.java-convention", version = "0.4.0" } | ||
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 |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| plugins { | ||
| `java-library` | ||
| jacoco | ||
| alias(commonLibs.plugins.hypertrace.publish) | ||
| alias(commonLibs.plugins.hypertrace.jacoco) | ||
| } | ||
|
|
||
| tasks.test { | ||
| useJUnitPlatform() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(projects.platformServiceFramework) | ||
|
|
||
| // Configuration | ||
| implementation(commonLibs.typesafe.config) | ||
| // Logging | ||
| implementation(commonLibs.slf4j2.api) | ||
| implementation(localLibs.awaitility) | ||
| } |
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,60 @@ | ||
| # 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. | ||
| com.fasterxml.jackson.core:jackson-annotations:2.16.1=runtimeClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-core:2.16.1=runtimeClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson.core:jackson-databind:2.16.1=runtimeClasspath,testRuntimeClasspath | ||
| com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath,testRuntimeClasspath | ||
| com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath,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.helger:profiler:1.1.1=runtimeClasspath,testRuntimeClasspath | ||
| com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath | ||
| commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath | ||
| io.dropwizard.metrics:metrics-core:4.2.25=runtimeClasspath,testRuntimeClasspath | ||
| io.dropwizard.metrics:metrics-healthchecks:4.2.25=runtimeClasspath,testRuntimeClasspath | ||
| io.dropwizard.metrics:metrics-jakarta-servlet:4.2.25=runtimeClasspath,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-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| io.micrometer:micrometer-commons:1.14.4=runtimeClasspath,testRuntimeClasspath | ||
| io.micrometer:micrometer-core:1.14.4=runtimeClasspath,testRuntimeClasspath | ||
| io.micrometer:micrometer-observation:1.14.4=runtimeClasspath,testRuntimeClasspath | ||
| io.micrometer:micrometer-registry-prometheus-simpleclient:1.14.4=runtimeClasspath,testRuntimeClasspath | ||
| io.netty:netty-bom:4.1.118.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.0.0=runtimeClasspath,testRuntimeClasspath | ||
| org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath | ||
| org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath | ||
| org.awaitility:awaitility:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-http:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-io:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-security:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-server:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-servlet:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.eclipse.jetty:jetty-util:11.0.24=runtimeClasspath,testRuntimeClasspath | ||
| org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath | ||
| org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath | ||
| org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath | ||
| org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath | ||
| org.slf4j:slf4j-api:2.0.9=runtimeClasspath,testRuntimeClasspath | ||
| empty=annotationProcessor |
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 |
|---|---|---|
| @@ -1,26 +1,25 @@ | ||
| plugins { | ||
| `java-library` | ||
| jacoco | ||
| alias(commonLibs.plugins.hypertrace.publish) | ||
| alias(commonLibs.plugins.hypertrace.jacoco) | ||
| } | ||
|
|
||
| dependencies { | ||
| api(projects.platformServiceFramework) | ||
| api(commonLibs.grpc.api) | ||
| api(localLibs.grpc.services) | ||
| api(commonLibs.hypertrace.grpcutils.client) | ||
| api(commonLibs.typesafe.config) | ||
| api(commonLibs.protobuf.java) | ||
| api(projects.serviceFrameworkSpi) | ||
|
|
||
| annotationProcessor(commonLibs.lombok) | ||
| compileOnly(commonLibs.lombok) | ||
|
|
||
| implementation(projects.platformMetrics) | ||
| implementation(commonLibs.grpc.inprocess) | ||
| implementation(commonLibs.grpc.netty) | ||
| implementation(commonLibs.slf4j2.api) | ||
|
Contributor
Author
There was a problem hiding this comment. Note we are moving this to slf4j2 here. We've already upgraded this pretty much everywhere, so it seems like it's about time but this is a breaking change. |
||
| implementation(localLibs.hypertrace.grpcutils.server) | ||
| } | ||
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.
Some of these can move to the shared BOM, but in this change I just inlined everything that wasn't already there.