From 956f2ec28bcf1f8bfb11e004c54b3c2b47918437 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Sat, 2 Aug 2025 10:16:10 -0400 Subject: [PATCH 1/4] build: switch to use bom --- .github/workflows/update-locks.yml | 30 +++++++++++ build.gradle.kts | 15 +++--- gradle/libs.versions.toml | 6 +++ grpc-circuitbreaker-utils/build.gradle.kts | 30 +++++------ grpc-circuitbreaker-utils/gradle.lockfile | 61 ++++++++++++++++++++++ grpc-client-rx-utils/build.gradle.kts | 24 ++++----- grpc-client-rx-utils/gradle.lockfile | 53 +++++++++++++++++++ grpc-client-utils/build.gradle.kts | 33 +++++------- grpc-client-utils/gradle.lockfile | 58 ++++++++++++++++++++ grpc-context-utils/build.gradle.kts | 37 ++++++------- grpc-context-utils/gradle.lockfile | 55 +++++++++++++++++++ grpc-server-rx-utils/build.gradle.kts | 26 ++++----- grpc-server-rx-utils/gradle.lockfile | 42 +++++++++++++++ grpc-server-utils/build.gradle.kts | 31 ++++------- grpc-server-utils/gradle.lockfile | 50 ++++++++++++++++++ grpc-validation-utils/build.gradle.kts | 8 +-- grpc-validation-utils/gradle.lockfile | 36 +++++++++++++ settings.gradle.kts | 10 ++++ 18 files changed, 484 insertions(+), 121 deletions(-) create mode 100644 .github/workflows/update-locks.yml create mode 100644 gradle/libs.versions.toml create mode 100644 grpc-circuitbreaker-utils/gradle.lockfile create mode 100644 grpc-client-rx-utils/gradle.lockfile create mode 100644 grpc-client-utils/gradle.lockfile create mode 100644 grpc-context-utils/gradle.lockfile create mode 100644 grpc-server-rx-utils/gradle.lockfile create mode 100644 grpc-server-utils/gradle.lockfile create mode 100644 grpc-validation-utils/gradle.lockfile diff --git a/.github/workflows/update-locks.yml b/.github/workflows/update-locks.yml new file mode 100644 index 0000000..ce21524 --- /dev/null +++ b/.github/workflows/update-locks.yml @@ -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 }} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 871952a..ce646cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,17 +2,16 @@ 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.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.0" apply false - id("org.owasp.dependencycheck") version "12.1.0" + alias(commonLibs.plugins.hypertrace.repository) + alias(commonLibs.plugins.hypertrace.ciutils) + alias(commonLibs.plugins.hypertrace.codestyle) apply false + alias(commonLibs.plugins.hypertrace.publish) apply false + alias(commonLibs.plugins.owasp.dependencycheck) } subprojects { group = "org.hypertrace.core.grpcutils" - pluginManager.withPlugin("org.hypertrace.publish-plugin") { + pluginManager.withPlugin(rootProject.commonLibs.plugins.hypertrace.publish.get().pluginId) { configure { license.set(License.APACHE_2_0) } @@ -25,7 +24,7 @@ subprojects { } } - apply(plugin = "org.hypertrace.code-style-plugin") + apply(plugin = rootProject.commonLibs.plugins.hypertrace.codestyle.get().pluginId) } dependencyCheck { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..5f4f312 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,6 @@ +[versions] +[libraries] +jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" } +resilience4j-circuitbreaker = { module = "io.github.resilience4j:resilience4j-circuitbreaker", version = "1.7.1" } +auth0-jwt = { module = "com.auth0:java-jwt", version = "4.4.0" } +auth0-jwks-rsa = { module = "com.auth0:jwks-rsa", version = "0.22.0" } \ No newline at end of file diff --git a/grpc-circuitbreaker-utils/build.gradle.kts b/grpc-circuitbreaker-utils/build.gradle.kts index 73d3c28..8c7d40c 100644 --- a/grpc-circuitbreaker-utils/build.gradle.kts +++ b/grpc-circuitbreaker-utils/build.gradle.kts @@ -1,28 +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) } dependencies { + api(commonLibs.grpc.api) + api(projects.grpcContextUtils) - api(platform("io.grpc:grpc-bom:1.68.3")) - api("io.grpc:grpc-api") - api(project(":grpc-context-utils")) + implementation(commonLibs.slf4j2.api) + implementation(localLibs.resilience4j.circuitbreaker) + implementation(commonLibs.typesafe.config) + implementation(commonLibs.guava) + implementation(localLibs.jakarta.inject.api) - implementation("org.slf4j:slf4j-api:1.7.36") - implementation("io.github.resilience4j:resilience4j-circuitbreaker:1.7.1") - implementation("com.typesafe:config:1.4.2") - implementation("com.google.guava:guava:32.0.1-jre") - implementation("jakarta.inject:jakarta.inject-api:2.0.1") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.projectlombok:lombok:1.18.24") - - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:5.8.0") - testImplementation("org.mockito:mockito-junit-jupiter:5.8.0") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/grpc-circuitbreaker-utils/gradle.lockfile b/grpc-circuitbreaker-utils/gradle.lockfile new file mode 100644 index 0000000..640f29e --- /dev/null +++ b/grpc-circuitbreaker-utils/gradle.lockfile @@ -0,0 +1,61 @@ +# 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.auth0:java-jwt:4.4.0=runtimeClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath,testRuntimeClasspath +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.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.28.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.2.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.typesafe:config:1.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.resilience4j:resilience4j-circuitbreaker:1.7.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.github.resilience4j:resilience4j-core:1.7.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.68.3=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.68.3=runtimeClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.vavr:vavr-match:0.10.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.vavr:vavr:0.10.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath +org.junit:junit-bom:5.10.0=testCompileClasspath +org.junit:junit-bom:5.10.1=testRuntimeClasspath +org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter: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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty= diff --git a/grpc-client-rx-utils/build.gradle.kts b/grpc-client-rx-utils/build.gradle.kts index c155d87..8f389be 100644 --- a/grpc-client-rx-utils/build.gradle.kts +++ b/grpc-client-rx-utils/build.gradle.kts @@ -1,25 +1,19 @@ 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) } dependencies { - api(platform("io.grpc:grpc-bom:1.68.3")) - api("io.reactivex.rxjava3:rxjava:3.1.4") - api("io.grpc:grpc-stub") - api(project(":grpc-context-utils")) - constraints { - api("com.google.protobuf:protobuf-java:3.25.5") { - because("https://nvd.nist.gov/vuln/detail/CVE-2024-7254") - } - } - implementation("io.grpc:grpc-context") + api(commonLibs.rxjava3) + api(commonLibs.grpc.stub) + api(projects.grpcContextUtils) + implementation(commonLibs.grpc.context) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:5.8.0") - testImplementation("org.mockito:mockito-junit-jupiter:5.8.0") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/grpc-client-rx-utils/gradle.lockfile b/grpc-client-rx-utils/gradle.lockfile new file mode 100644 index 0000000..55a35e5 --- /dev/null +++ b/grpc-client-rx-utils/gradle.lockfile @@ -0,0 +1,53 @@ +# 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.auth0:java-jwt:4.4.0=runtimeClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath,testRuntimeClasspath +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.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.28.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.2.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,testCompileClasspath +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.68.3=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath +org.junit:junit-bom:5.10.0=testCompileClasspath +org.junit:junit-bom:5.10.1=testRuntimeClasspath +org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.8.0=testCompileClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath +empty=annotationProcessor diff --git a/grpc-client-utils/build.gradle.kts b/grpc-client-utils/build.gradle.kts index 488a5de..95364a5 100644 --- a/grpc-client-utils/build.gradle.kts +++ b/grpc-client-utils/build.gradle.kts @@ -1,33 +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) } dependencies { - api(platform("io.grpc:grpc-bom:1.68.3")) - api("io.grpc:grpc-context") - api("io.grpc:grpc-api") - api("io.grpc:grpc-inprocess") - api(platform("io.netty:netty-bom:4.1.118.Final")) - constraints { - api("com.google.protobuf:protobuf-java:3.25.5") { - because("https://nvd.nist.gov/vuln/detail/CVE-2024-7254") - } - } + api(commonLibs.grpc.context) + api(commonLibs.grpc.api) + api(commonLibs.grpc.inprocess) - implementation(project(":grpc-context-utils")) - implementation("org.slf4j:slf4j-api:1.7.36") - implementation("io.grpc:grpc-core") + implementation(projects.grpcContextUtils) + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.grpc.core) - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.projectlombok:lombok:1.18.24") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:5.8.0") - testRuntimeOnly("io.grpc:grpc-netty") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testRuntimeOnly(commonLibs.grpc.netty) } tasks.test { diff --git a/grpc-client-utils/gradle.lockfile b/grpc-client-utils/gradle.lockfile new file mode 100644 index 0000000..c8f94ef --- /dev/null +++ b/grpc-client-utils/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. +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.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.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.28.0=compileClasspath,testCompileClasspath +com.google.errorprone:error_prone_annotations:2.38.0=runtimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.2=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-android=runtimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-inprocess:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-netty:1.68.3=testRuntimeClasspath +io.grpc:grpc-util:1.68.3=testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.118.Final=testRuntimeClasspath +io.netty:netty-codec-http2:4.1.118.Final=testRuntimeClasspath +io.netty:netty-codec-http:4.1.118.Final=testRuntimeClasspath +io.netty:netty-codec-socks:4.1.118.Final=testRuntimeClasspath +io.netty:netty-codec:4.1.118.Final=testRuntimeClasspath +io.netty:netty-common:4.1.118.Final=testRuntimeClasspath +io.netty:netty-handler-proxy:4.1.118.Final=testRuntimeClasspath +io.netty:netty-handler:4.1.118.Final=testRuntimeClasspath +io.netty:netty-resolver:4.1.118.Final=testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.118.Final=testRuntimeClasspath +io.netty:netty-transport:4.1.118.Final=testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.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.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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty= diff --git a/grpc-context-utils/build.gradle.kts b/grpc-context-utils/build.gradle.kts index f164f30..60bfa58 100644 --- a/grpc-context-utils/build.gradle.kts +++ b/grpc-context-utils/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,27 +10,20 @@ tasks.test { } dependencies { - api(platform("io.grpc:grpc-bom:1.68.3")) - api(platform("com.fasterxml.jackson:jackson-bom:2.16.0")) - constraints { - api("com.google.protobuf:protobuf-java:3.25.5") { - because("https://nvd.nist.gov/vuln/detail/CVE-2024-7254") - } - } - implementation("io.grpc:grpc-core") + implementation(commonLibs.grpc.core) - implementation("com.auth0:java-jwt:4.4.0") - implementation("com.auth0:jwks-rsa:0.22.0") - implementation("com.google.guava:guava:32.0.1-jre") - implementation("org.slf4j:slf4j-api:1.7.36") + implementation(localLibs.auth0.jwt) + implementation(localLibs.auth0.jwks.rsa) + implementation(commonLibs.guava) + implementation(commonLibs.slf4j2.api) - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.projectlombok:lombok:1.18.24") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:5.8.0") - testImplementation("org.mockito:mockito-junit-jupiter:5.8.0") - testImplementation("com.fasterxml.jackson.core:jackson-annotations:2.15.2") - testAnnotationProcessor("org.projectlombok:lombok:1.18.24") - testCompileOnly("org.projectlombok:lombok:1.18.24") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) + testImplementation(commonLibs.jackson.databind) + testAnnotationProcessor(commonLibs.lombok) + testCompileOnly(commonLibs.lombok) } diff --git a/grpc-context-utils/gradle.lockfile b/grpc-context-utils/gradle.lockfile new file mode 100644 index 0000000..6835f85 --- /dev/null +++ b/grpc-context-utils/gradle.lockfile @@ -0,0 +1,55 @@ +# 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.auth0:java-jwt:4.4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.16.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.16.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.16.1=runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,runtimeClasspath,testCompileClasspath,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.28.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.2.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 +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.68.3=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath +org.junit:junit-bom:5.10.0=testCompileClasspath +org.junit:junit-bom:5.10.1=testRuntimeClasspath +org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter: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 +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty= diff --git a/grpc-server-rx-utils/build.gradle.kts b/grpc-server-rx-utils/build.gradle.kts index 9527c69..7b3d7a7 100644 --- a/grpc-server-rx-utils/build.gradle.kts +++ b/grpc-server-rx-utils/build.gradle.kts @@ -1,28 +1,22 @@ 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) } dependencies { - api(platform("io.grpc:grpc-bom:1.68.3")) - api("io.reactivex.rxjava3:rxjava:3.1.4") - api("io.grpc:grpc-stub") - constraints { - api("com.google.protobuf:protobuf-java:3.25.5") { - because("https://nvd.nist.gov/vuln/detail/CVE-2024-7254") - } - } + api(commonLibs.rxjava3) + api(commonLibs.grpc.stub) - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.projectlombok:lombok:1.18.24") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - implementation("org.slf4j:slf4j-api:1.7.36") + implementation(commonLibs.slf4j2.api) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:5.8.0") - testImplementation("org.mockito:mockito-junit-jupiter:5.8.0") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/grpc-server-rx-utils/gradle.lockfile b/grpc-server-rx-utils/gradle.lockfile new file mode 100644 index 0000000..1413248 --- /dev/null +++ b/grpc-server-rx-utils/gradle.lockfile @@ -0,0 +1,42 @@ +# 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: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.28.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.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,testCompileClasspath +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-stub:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath +org.junit:junit-bom:5.10.0=testCompileClasspath +org.junit:junit-bom:5.10.1=testRuntimeClasspath +org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter: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.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty= diff --git a/grpc-server-utils/build.gradle.kts b/grpc-server-utils/build.gradle.kts index d5da014..de8bfed 100644 --- a/grpc-server-utils/build.gradle.kts +++ b/grpc-server-utils/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,24 +10,15 @@ tasks.test { } dependencies { - api(platform("io.grpc:grpc-bom:1.68.3")) - api("io.grpc:grpc-context") - api("io.grpc:grpc-api") + api(commonLibs.grpc.context) + api(commonLibs.grpc.api) + implementation(projects.grpcContextUtils) + implementation(commonLibs.slf4j2.api) - api(platform("io.netty:netty-bom:4.1.118.Final")) - constraints { - api("com.google.protobuf:protobuf-java:3.25.5") { - because("https://nvd.nist.gov/vuln/detail/CVE-2024-7254") - } - } + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - implementation(project(":grpc-context-utils")) - implementation("org.slf4j:slf4j-api:1.7.36") - - annotationProcessor("org.projectlombok:lombok:1.18.24") - compileOnly("org.projectlombok:lombok:1.18.24") - - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:5.8.0") - testImplementation("org.mockito:mockito-junit-jupiter:5.8.0") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } diff --git a/grpc-server-utils/gradle.lockfile b/grpc-server-utils/gradle.lockfile new file mode 100644 index 0000000..f6e3ab2 --- /dev/null +++ b/grpc-server-utils/gradle.lockfile @@ -0,0 +1,50 @@ +# 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.auth0:java-jwt:4.4.0=runtimeClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath,testRuntimeClasspath +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.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.28.0=compileClasspath,testCompileClasspath +com.google.errorprone:error_prone_annotations:2.38.0=runtimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.2=runtimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.2.1-android=runtimeClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.68.3=runtimeClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter-params:5.10.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.10.0=testCompileClasspath +org.junit.jupiter:junit-jupiter:5.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath +org.junit.platform:junit-platform-commons:1.10.1=testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath +org.junit:junit-bom:5.10.0=testCompileClasspath +org.junit:junit-bom:5.10.1=testRuntimeClasspath +org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter: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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty= diff --git a/grpc-validation-utils/build.gradle.kts b/grpc-validation-utils/build.gradle.kts index ef12398..9c27deb 100644 --- a/grpc-validation-utils/build.gradle.kts +++ b/grpc-validation-utils/build.gradle.kts @@ -1,10 +1,10 @@ plugins { `java-library` - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.hypertrace.publish) } dependencies { - api(project(":grpc-context-utils")) - api("io.grpc:grpc-api") - implementation("com.google.protobuf:protobuf-java-util:3.21.7") + api(projects.grpcContextUtils) + api(commonLibs.grpc.api) + implementation(commonLibs.protobuf.javautil) } diff --git a/grpc-validation-utils/gradle.lockfile b/grpc-validation-utils/gradle.lockfile new file mode 100644 index 0000000..d3cf0c6 --- /dev/null +++ b/grpc-validation-utils/gradle.lockfile @@ -0,0 +1,36 @@ +# 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.auth0:java-jwt:4.4.0=runtimeClasspath,testRuntimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath,testRuntimeClasspath +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.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=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,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.2.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,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.grpc:grpc-context:1.68.3=runtimeClasspath,testRuntimeClasspath +io.grpc:grpc-core:1.68.3=runtimeClasspath,testRuntimeClasspath +io.netty:netty-bom:4.1.118.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,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.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath +empty=annotationProcessor diff --git a/settings.gradle.kts b/settings.gradle.kts index 976c820..726de93 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,5 @@ +import org.hypertrace.gradle.dependency.DependencyPluginSettingExtension + rootProject.name = "grpc-utils" pluginManagement { @@ -10,8 +12,16 @@ 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.51") } +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + + include(":grpc-client-utils") include(":grpc-client-rx-utils") include(":grpc-server-rx-utils") From 01baed0e2f01e30a4dcc100102481c66c5574ae0 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Sat, 2 Aug 2025 10:23:16 -0400 Subject: [PATCH 2/4] chore: add history for autobuild --- .github/workflows/codeql-analysis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 08e1805..afe7a97 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -27,6 +27,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 014e67570fb980c16344501740a8d86820ef5c6b Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Sat, 2 Aug 2025 11:14:03 -0400 Subject: [PATCH 3/4] ci: push version to bom on publish --- .github/workflows/publish.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e0117bf..988b4c9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,6 @@ on: release: types: - created - workflow_dispatch: jobs: publish-artifacts: @@ -24,5 +23,28 @@ jobs: 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 }} + post-publish-artifacts: + runs-on: ubuntu-24.04 + needs: [ publish-artifacts ] + steps: + - 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: >- + ["hypertrace-bom"] + - name: Auto upgrade BOM + uses: peter-evans/repository-dispatch@v3 + with: + token: ${{ steps.generate-token.outputs.token }} + repository: hypertrace/hypertrace-bom + event-type: upgrade-version + client-payload: | + { + "repository": "${{ github.repository }}", + "version": "${{ github.ref }}" + } From 43c5ea1c81caed35f6ec3ea76777de4901cce07e Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Sun, 3 Aug 2025 15:58:12 -0300 Subject: [PATCH 4/4] chore: update --- gradle/libs.versions.toml | 1 - grpc-circuitbreaker-utils/build.gradle.kts | 2 +- grpc-circuitbreaker-utils/gradle.lockfile | 2 +- grpc-client-rx-utils/gradle.lockfile | 2 +- grpc-client-utils/gradle.lockfile | 2 +- grpc-context-utils/gradle.lockfile | 2 +- grpc-server-rx-utils/gradle.lockfile | 2 +- grpc-server-utils/gradle.lockfile | 2 +- grpc-validation-utils/gradle.lockfile | 6 +++--- settings.gradle.kts | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5f4f312..d081039 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,5 @@ [versions] [libraries] -jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" } resilience4j-circuitbreaker = { module = "io.github.resilience4j:resilience4j-circuitbreaker", version = "1.7.1" } auth0-jwt = { module = "com.auth0:java-jwt", version = "4.4.0" } auth0-jwks-rsa = { module = "com.auth0:jwks-rsa", version = "0.22.0" } \ No newline at end of file diff --git a/grpc-circuitbreaker-utils/build.gradle.kts b/grpc-circuitbreaker-utils/build.gradle.kts index 8c7d40c..58f6201 100644 --- a/grpc-circuitbreaker-utils/build.gradle.kts +++ b/grpc-circuitbreaker-utils/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { implementation(localLibs.resilience4j.circuitbreaker) implementation(commonLibs.typesafe.config) implementation(commonLibs.guava) - implementation(localLibs.jakarta.inject.api) + implementation(commonLibs.jakarta.inject.api) annotationProcessor(commonLibs.lombok) compileOnly(commonLibs.lombok) diff --git a/grpc-circuitbreaker-utils/gradle.lockfile b/grpc-circuitbreaker-utils/gradle.lockfile index 640f29e..eab15b4 100644 --- a/grpc-circuitbreaker-utils/gradle.lockfile +++ b/grpc-circuitbreaker-utils/gradle.lockfile @@ -38,7 +38,7 @@ org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath diff --git a/grpc-client-rx-utils/gradle.lockfile b/grpc-client-rx-utils/gradle.lockfile index 55a35e5..b23e738 100644 --- a/grpc-client-rx-utils/gradle.lockfile +++ b/grpc-client-rx-utils/gradle.lockfile @@ -30,7 +30,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath diff --git a/grpc-client-utils/gradle.lockfile b/grpc-client-utils/gradle.lockfile index c8f94ef..259e8ca 100644 --- a/grpc-client-utils/gradle.lockfile +++ b/grpc-client-utils/gradle.lockfile @@ -41,7 +41,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=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 diff --git a/grpc-context-utils/gradle.lockfile b/grpc-context-utils/gradle.lockfile index 6835f85..4e56b5f 100644 --- a/grpc-context-utils/gradle.lockfile +++ b/grpc-context-utils/gradle.lockfile @@ -32,7 +32,7 @@ org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath diff --git a/grpc-server-rx-utils/gradle.lockfile b/grpc-server-rx-utils/gradle.lockfile index 1413248..0a7ec51 100644 --- a/grpc-server-rx-utils/gradle.lockfile +++ b/grpc-server-rx-utils/gradle.lockfile @@ -18,7 +18,7 @@ net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath diff --git a/grpc-server-utils/gradle.lockfile b/grpc-server-utils/gradle.lockfile index f6e3ab2..e6c9e50 100644 --- a/grpc-server-utils/gradle.lockfile +++ b/grpc-server-utils/gradle.lockfile @@ -27,7 +27,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath diff --git a/grpc-validation-utils/gradle.lockfile b/grpc-validation-utils/gradle.lockfile index d3cf0c6..2980279 100644 --- a/grpc-validation-utils/gradle.lockfile +++ b/grpc-validation-utils/gradle.lockfile @@ -18,8 +18,8 @@ com.google.guava:guava:32.1.2-jre=compileClasspath,testCompileClasspath com.google.guava:guava:33.2.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,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java-util:3.25.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.protobuf:protobuf-java:3.25.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-api:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-bom:1.68.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-context:1.68.3=runtimeClasspath,testRuntimeClasspath @@ -30,7 +30,7 @@ org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-bom:11.0.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.51=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.52=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/settings.gradle.kts b/settings.gradle.kts index 726de93..42bc872 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ plugins { } configure { - catalogVersion.set("0.3.51") + catalogVersion.set("0.3.52") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")