diff --git a/.github/workflows/update-locks.yml b/.github/workflows/update-locks.yml new file mode 100644 index 00000000..70369358 --- /dev/null +++ b/.github/workflows/update-locks.yml @@ -0,0 +1,30 @@ +name: Update Locks +on: + workflow_dispatch: + schedule: + - cron: '18 22 * * 3' +jobs: + update-versions: + runs-on: ubuntu-22.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 }} diff --git a/alerting-config-service-api/build.gradle.kts b/alerting-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/alerting-config-service-api/build.gradle.kts +++ b/alerting-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/alerting-config-service-api/gradle.lockfile b/alerting-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/alerting-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/alerting-config-service-impl/build.gradle.kts b/alerting-config-service-impl/build.gradle.kts index 1c282485..97e5d9a3 100644 --- a/alerting-config-service-impl/build.gradle.kts +++ b/alerting-config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -12,21 +12,21 @@ dependencies { implementation(projects.validationUtils) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.guava) - implementation(libs.rxjava3) + implementation(commonLibs.guava) + implementation(commonLibs.rxjava3) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) - implementation(libs.hypertrace.grpcutils.rxserver) - implementation(libs.hypertrace.grpcutils.rxclient) - implementation(libs.slf4j.api) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) + implementation(commonLibs.hypertrace.grpcutils.rx.server) + implementation(commonLibs.hypertrace.grpcutils.rx.client) + implementation(commonLibs.slf4j2.api) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/alerting-config-service-impl/gradle.lockfile b/alerting-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..3b4aec4a --- /dev/null +++ b/alerting-config-service-impl/gradle.lockfile @@ -0,0 +1,52 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/build.gradle.kts b/build.gradle.kts index 43ae33ff..bc1c24ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,19 +1,13 @@ plugins { - id("org.hypertrace.repository-plugin") version "0.4.2" - id("org.hypertrace.ci-utils-plugin") version "0.3.2" - id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false - id("org.hypertrace.publish-plugin") version "1.0.5" apply false - id("org.hypertrace.docker-java-application-plugin") version "0.9.9" apply false - id("org.hypertrace.docker-publish-plugin") version "0.9.9" apply false - id("org.hypertrace.integration-test-plugin") version "0.2.0" apply false - id("org.hypertrace.code-style-plugin") version "1.2.0" apply false - id("com.google.protobuf") version "0.8.19" apply false - id("org.owasp.dependencycheck") version "8.2.1" + 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.config.service" - pluginManager.withPlugin("org.hypertrace.publish-plugin") { + pluginManager.withPlugin(rootProject.commonLibs.plugins.hypertrace.publish.get().pluginId) { configure { license.set(org.hypertrace.gradle.publishing.License.TRACEABLE_COMMUNITY) } @@ -25,8 +19,7 @@ subprojects { targetCompatibility = JavaVersion.VERSION_11 } } - - apply(plugin = "org.hypertrace.code-style-plugin") + apply(plugin = rootProject.commonLibs.plugins.hypertrace.codestyle.get().pluginId) } dependencyCheck { diff --git a/config-proto-converter/build.gradle.kts b/config-proto-converter/build.gradle.kts index b0036232..944963ce 100644 --- a/config-proto-converter/build.gradle.kts +++ b/config-proto-converter/build.gradle.kts @@ -1,19 +1,9 @@ plugins { `java-library` - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.hypertrace.publish) } dependencies { - api(libs.grpc.protobuf) - implementation(libs.protobuf.javautil) - constraints { - implementation(libs.gson) { - because("https://snyk.io/vuln/SNYK-JAVA-COMGOOGLECODEGSON-1730327") - } - } - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.grpc.protobuf) + implementation(commonLibs.protobuf.javautil) } diff --git a/config-proto-converter/gradle.lockfile b/config-proto-converter/gradle.lockfile new file mode 100644 index 00000000..a0bae389 --- /dev/null +++ b/config-proto-converter/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/config-service-api/build.gradle.kts b/config-service-api/build.gradle.kts index 9b3b1990..813aa060 100644 --- a/config-service-api/build.gradle.kts +++ b/config-service-api/build.gradle.kts @@ -1,29 +1,24 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` `java-test-fixtures` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } val generateLocalGoGrpcFiles = false protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { // Optional: an artifact spec for a protoc plugin, with "grpc" as // the identifier, which can be referred to in the "plugins" // container of the "generateProtoTasks" closure. id("grpc_java") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } if (generateLocalGoGrpcFiles) { @@ -62,20 +57,15 @@ sourceSets { } dependencies { - api(libs.bundles.grpc.api) + api(commonLibs.bundles.grpc.api) - testFixturesApi(libs.grpc.api) + testFixturesApi(commonLibs.grpc.api) testFixturesApi(projects.configServiceApi) - testFixturesImplementation(libs.grpc.stub) - testFixturesImplementation(libs.grpc.core) - testFixturesImplementation(libs.hypertrace.grpcutils.context) - testFixturesImplementation(libs.mockito.core) - testFixturesImplementation(libs.guava) - testFixturesAnnotationProcessor(libs.lombok) - testFixturesCompileOnly(libs.lombok) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + testFixturesImplementation(commonLibs.grpc.stub) + testFixturesImplementation(commonLibs.grpc.core) + testFixturesImplementation(commonLibs.hypertrace.grpcutils.context) + testFixturesImplementation(commonLibs.mockito.core) + testFixturesImplementation(commonLibs.guava) + testFixturesAnnotationProcessor(commonLibs.lombok) + testFixturesCompileOnly(commonLibs.lombok) } diff --git a/config-service-api/gradle.lockfile b/config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/config-service-change-event-api/build.gradle.kts b/config-service-change-event-api/build.gradle.kts index 42360d88..2a4e0919 100644 --- a/config-service-change-event-api/build.gradle.kts +++ b/config-service-change-event-api/build.gradle.kts @@ -1,15 +1,12 @@ -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc - plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } } @@ -22,7 +19,7 @@ sourceSets { } dependencies { - api(libs.protobuf.java) - api(platform(libs.kafka.bom)) - api(libs.kafka.clients) + api(commonLibs.protobuf.java) + api(platform(commonLibs.hypertrace.kafka.bom)) + api(commonLibs.kafka.clients) } diff --git a/config-service-change-event-api/gradle.lockfile b/config-service-change-event-api/gradle.lockfile new file mode 100644 index 00000000..bed92104 --- /dev/null +++ b/config-service-change-event-api/gradle.lockfile @@ -0,0 +1,14 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty=annotationProcessor diff --git a/config-service-change-event-generator/build.gradle.kts b/config-service-change-event-generator/build.gradle.kts index fd0a5e0e..a5d172b6 100644 --- a/config-service-change-event-generator/build.gradle.kts +++ b/config-service-change-event-generator/build.gradle.kts @@ -1,26 +1,26 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { api(projects.configServiceChangeEventApi) - api(libs.typesafe.config) - api(libs.hypertrace.grpcutils.context) + api(commonLibs.typesafe.config) + api(commonLibs.hypertrace.grpcutils.context) implementation(projects.configProtoConverter) - implementation(libs.hypertrace.eventstore) - implementation(libs.guava) - implementation(libs.slf4j.api) + implementation(commonLibs.hypertrace.eventstore) + implementation(commonLibs.guava) + implementation(commonLibs.slf4j2.api) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) - testRuntimeOnly(libs.slf4j.log4jimpl) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) + testRuntimeOnly(commonLibs.log4j.slf4j2.impl) } tasks.test { diff --git a/config-service-change-event-generator/gradle.lockfile b/config-service-change-event-generator/gradle.lockfile new file mode 100644 index 00000000..57bd5a53 --- /dev/null +++ b/config-service-change-event-generator/gradle.lockfile @@ -0,0 +1,43 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/config-service-factory/build.gradle.kts b/config-service-factory/build.gradle.kts index d5b73ba5..deb262ee 100644 --- a/config-service-factory/build.gradle.kts +++ b/config-service-factory/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - api(libs.hypertrace.grpc.framework) + api(commonLibs.hypertrace.framework.grpc) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.hypertrace.documentstore) + implementation(commonLibs.hypertrace.documentstore) implementation(projects.configServiceImpl) implementation(projects.spacesConfigServiceImpl) implementation(projects.labelsConfigServiceImpl) diff --git a/config-service-factory/gradle.lockfile b/config-service-factory/gradle.lockfile new file mode 100644 index 00000000..f8f81ae2 --- /dev/null +++ b/config-service-factory/gradle.lockfile @@ -0,0 +1,112 @@ +# 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. +aopalliance:aopalliance:1.0=runtimeClasspath +com.auth0:java-jwt:4.4.0=runtimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.rholder:guava-retrying:2.0.0=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.inject:guice:6.0.0=runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.google.re2j:re2j:1.7=runtimeClasspath +com.helger:profiler:1.1.1=runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-codec:commons-codec:1.15=runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +commons-logging:commons-logging:1.2=runtimeClasspath +io.dropwizard.metrics:metrics-core:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-healthchecks:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-json:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-jvm:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-servlets:4.2.16=runtimeClasspath +io.github.mweirauch:micrometer-jvm-extras:0.2.2=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-services:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.micrometer:micrometer-commons:1.10.2=runtimeClasspath +io.micrometer:micrometer-core:1.10.2=runtimeClasspath +io.micrometer:micrometer-observation:1.10.2=runtimeClasspath +io.micrometer:micrometer-registry-prometheus:1.10.2=runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +io.prometheus:simpleclient:0.16.0=runtimeClasspath +io.prometheus:simpleclient_common:0.16.0=runtimeClasspath +io.prometheus:simpleclient_dropwizard:0.12.0=runtimeClasspath +io.prometheus:simpleclient_pushgateway:0.12.0=runtimeClasspath +io.prometheus:simpleclient_servlet:0.12.0=runtimeClasspath +io.prometheus:simpleclient_servlet_common:0.12.0=runtimeClasspath +io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath +io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath +io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +javax.inject:javax.inject:1=runtimeClasspath +javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath +javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath +net.jodah:failsafe:2.4.4=runtimeClasspath +org.apache.commons:commons-collections4:4.4=runtimeClasspath +org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath +org.apache.commons:commons-lang3:3.12.0=runtimeClasspath +org.apache.commons:commons-pool2:2.10.0=runtimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath +org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.apache.logging.log4j:log4j-api:2.19.0=runtimeClasspath +org.apache.logging.log4j:log4j-core:2.19.0=runtimeClasspath +org.apache.logging.log4j:log4j-slf4j-impl:2.19.0=runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.eclipse.jetty:jetty-http:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-io:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-security:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-server:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-servlet:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-util-ajax:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-util:9.4.53.v20231009=runtimeClasspath +org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.documentstore:document-store:0.7.44=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.6=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-utils:0.12.6=runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.62=compileClasspath,runtimeClasspath +org.hypertrace.core.serviceframework:platform-metrics:0.1.62=runtimeClasspath +org.hypertrace.core.serviceframework:platform-service-framework:0.1.62=compileClasspath,runtimeClasspath +org.hypertrace.core.serviceframework:service-framework-spi:0.1.62=compileClasspath,runtimeClasspath +org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.mongodb:bson-record-codec:4.9.0=runtimeClasspath +org.mongodb:bson:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-core:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-sync:4.9.0=runtimeClasspath +org.postgresql:postgresql:42.5.4=runtimeClasspath +org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty=annotationProcessor diff --git a/config-service-impl/build.gradle.kts b/config-service-impl/build.gradle.kts index 39444568..0e041826 100644 --- a/config-service-impl/build.gradle.kts +++ b/config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -9,21 +9,21 @@ dependencies { implementation(projects.configServiceChangeEventGenerator) - implementation(libs.jackson.databind) - implementation(libs.guava) - implementation(libs.protobuf.javautil) - implementation(libs.typesafe.config) - implementation(libs.slf4j.api) + implementation(commonLibs.jackson.databind) + implementation(commonLibs.guava) + implementation(commonLibs.protobuf.javautil) + implementation(commonLibs.typesafe.config) + implementation(commonLibs.slf4j2.api) - implementation(libs.hypertrace.documentstore) - implementation(libs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.documentstore) + implementation(commonLibs.hypertrace.grpcutils.context) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.hypertrace.grpcutils.client) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.hypertrace.grpcutils.client) } tasks.test { diff --git a/config-service-impl/gradle.lockfile b/config-service-impl/gradle.lockfile new file mode 100644 index 00000000..219c06e5 --- /dev/null +++ b/config-service-impl/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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +commons-logging:commons-logging:1.2=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +net.jodah:failsafe:2.4.4=runtimeClasspath +org.apache.commons:commons-collections4:4.4=runtimeClasspath +org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath +org.apache.commons:commons-lang3:3.12.0=runtimeClasspath +org.apache.commons:commons-pool2:2.10.0=runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.documentstore:document-store:0.7.44=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.mongodb:bson-record-codec:4.9.0=runtimeClasspath +org.mongodb:bson:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-core:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-sync:4.9.0=runtimeClasspath +org.postgresql:postgresql:42.5.4=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/config-service/build.gradle.kts b/config-service/build.gradle.kts index b991e08e..cc126e3d 100644 --- a/config-service/build.gradle.kts +++ b/config-service/build.gradle.kts @@ -9,11 +9,11 @@ plugins { java application jacoco - id("org.hypertrace.docker-java-application-plugin") - id("org.hypertrace.docker-publish-plugin") - id("org.hypertrace.integration-test-plugin") - id("org.hypertrace.jacoco-report-plugin") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.hypertrace.docker.application) + alias(commonLibs.plugins.hypertrace.docker.publish) + alias(commonLibs.plugins.hypertrace.integrationtest) + alias(commonLibs.plugins.hypertrace.jacoco) + alias(commonLibs.plugins.hypertrace.publish) } tasks.register("createIntegrationTestNetwork") { @@ -55,21 +55,21 @@ tasks.integrationTest { } dependencies { - implementation(libs.hypertrace.grpc.framework) + implementation(commonLibs.hypertrace.framework.grpc) implementation(projects.configServiceFactory) - runtimeOnly(libs.slf4j.log4jimpl) - runtimeOnly(libs.grpc.netty) + runtimeOnly(commonLibs.log4j.slf4j2.impl) + runtimeOnly(commonLibs.grpc.netty) // Integration test dependencies integrationTestImplementation(projects.configServiceImpl) integrationTestImplementation(projects.configProtoConverter) - integrationTestImplementation(libs.junit.jupiter) - integrationTestImplementation(libs.guava) - integrationTestImplementation(libs.hypertrace.framework.integrationtest) - integrationTestImplementation(libs.hypertrace.grpcutils.client) - integrationTestImplementation(libs.hypertrace.grpcutils.context) - integrationTestImplementation(libs.hypertrace.documentstore) + integrationTestImplementation(commonLibs.junit.jupiter) + integrationTestImplementation(commonLibs.guava) + integrationTestImplementation(commonLibs.hypertrace.integrationtest.framework) + integrationTestImplementation(commonLibs.hypertrace.grpcutils.client) + integrationTestImplementation(commonLibs.hypertrace.grpcutils.context) + integrationTestImplementation(commonLibs.hypertrace.documentstore) } application { diff --git a/config-service/gradle.lockfile b/config-service/gradle.lockfile new file mode 100644 index 00000000..1ad0a71c --- /dev/null +++ b/config-service/gradle.lockfile @@ -0,0 +1,125 @@ +# 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. +aopalliance:aopalliance:1.0=runtimeClasspath +com.auth0:java-jwt:4.4.0=runtimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.rholder:guava-retrying:2.0.0=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.inject:guice:6.0.0=runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.google.re2j:re2j:1.7=runtimeClasspath +com.helger:profiler:1.1.1=runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-codec:commons-codec:1.15=runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +commons-logging:commons-logging:1.2=runtimeClasspath +io.dropwizard.metrics:metrics-core:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-healthchecks:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-json:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-jvm:4.2.16=runtimeClasspath +io.dropwizard.metrics:metrics-servlets:4.2.16=runtimeClasspath +io.github.mweirauch:micrometer-jvm-extras:0.2.2=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-netty:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-services:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.micrometer:micrometer-commons:1.10.2=runtimeClasspath +io.micrometer:micrometer-core:1.10.2=runtimeClasspath +io.micrometer:micrometer-observation:1.10.2=runtimeClasspath +io.micrometer:micrometer-registry-prometheus:1.10.2=runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.netty:netty-buffer:4.1.100.Final=runtimeClasspath +io.netty:netty-codec-http2:4.1.100.Final=runtimeClasspath +io.netty:netty-codec-http:4.1.100.Final=runtimeClasspath +io.netty:netty-codec-socks:4.1.100.Final=runtimeClasspath +io.netty:netty-codec:4.1.100.Final=runtimeClasspath +io.netty:netty-common:4.1.100.Final=runtimeClasspath +io.netty:netty-handler-proxy:4.1.100.Final=runtimeClasspath +io.netty:netty-handler:4.1.100.Final=runtimeClasspath +io.netty:netty-resolver:4.1.100.Final=runtimeClasspath +io.netty:netty-transport-native-unix-common:4.1.100.Final=runtimeClasspath +io.netty:netty-transport:4.1.100.Final=runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +io.prometheus:simpleclient:0.16.0=runtimeClasspath +io.prometheus:simpleclient_common:0.16.0=runtimeClasspath +io.prometheus:simpleclient_dropwizard:0.12.0=runtimeClasspath +io.prometheus:simpleclient_pushgateway:0.12.0=runtimeClasspath +io.prometheus:simpleclient_servlet:0.12.0=runtimeClasspath +io.prometheus:simpleclient_servlet_common:0.12.0=runtimeClasspath +io.prometheus:simpleclient_tracer_common:0.16.0=runtimeClasspath +io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath +io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath +javax.inject:javax.inject:1=runtimeClasspath +javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath +javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath +net.jodah:failsafe:2.4.4=runtimeClasspath +org.apache.commons:commons-collections4:4.4=runtimeClasspath +org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath +org.apache.commons:commons-lang3:3.12.0=runtimeClasspath +org.apache.commons:commons-pool2:2.10.0=runtimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath +org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=runtimeClasspath +org.apache.logging.log4j:log4j-api:2.20.0=runtimeClasspath +org.apache.logging.log4j:log4j-core:2.20.0=runtimeClasspath +org.apache.logging.log4j:log4j-slf4j-impl:2.19.0=runtimeClasspath +org.apache.logging.log4j:log4j-slf4j2-impl:2.20.0=runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.eclipse.jetty:jetty-http:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-io:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-security:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-server:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-servlet:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-util-ajax:9.4.53.v20231009=runtimeClasspath +org.eclipse.jetty:jetty-util:9.4.53.v20231009=runtimeClasspath +org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.documentstore:document-store:0.7.44=runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.6=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-utils:0.12.6=runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.62=compileClasspath,runtimeClasspath +org.hypertrace.core.serviceframework:platform-metrics:0.1.62=runtimeClasspath +org.hypertrace.core.serviceframework:platform-service-framework:0.1.62=compileClasspath,runtimeClasspath +org.hypertrace.core.serviceframework:service-framework-spi:0.1.62=compileClasspath,runtimeClasspath +org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.mongodb:bson-record-codec:4.9.0=runtimeClasspath +org.mongodb:bson:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-core:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-sync:4.9.0=runtimeClasspath +org.postgresql:postgresql:42.5.4=runtimeClasspath +org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty=annotationProcessor diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76fcf244..1fda6f60 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,62 +1,2 @@ -[versions] -protoc = "3.23.2" -grpc = "1.57.2" -gson = "2.9.0" -hypertrace-grpcutils = "0.12.5" -hypertrace-framework = "0.1.61" -kafka-streams-framework = "0.3.9" -lombok = "1.18.28" -jackson = "2.15.2" - -junit = "5.9.2" -mockito = "5.2.0" - [libraries] - -hypertrace-grpcutils-client = { module = "org.hypertrace.core.grpcutils:grpc-client-utils", version.ref = "hypertrace-grpcutils" } -hypertrace-grpcutils-server = { module = "org.hypertrace.core.grpcutils:grpc-server-utils", version.ref = "hypertrace-grpcutils" } -hypertrace-grpcutils-context = { module = "org.hypertrace.core.grpcutils:grpc-context-utils", version.ref = "hypertrace-grpcutils" } -hypertrace-grpcutils-rxserver = { module = "org.hypertrace.core.grpcutils:grpc-server-rx-utils", version.ref = "hypertrace-grpcutils" } -hypertrace-grpcutils-rxclient = { module = "org.hypertrace.core.grpcutils:grpc-client-rx-utils", version.ref = "hypertrace-grpcutils" } - -hypertrace-grpc-framework = { module = "org.hypertrace.core.serviceframework:platform-grpc-service-framework", version.ref = "hypertrace-framework" } -hypertrace-framework-integrationtest = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-framework" } - -hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.7.44" } -hypertrace-eventstore = { module = "org.hypertrace.core.eventstore:event-store", version = "0.1.3" } - -guava = { module = "com.google.guava:guava", version = "32.0.1-jre" } -rholder-guava-retrying = { module = "com.github.rholder:guava-retrying", version = "2.0.0" } -guice = { module = "com.google.inject:guice", version = "5.0.1" } -javax-annotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" } -typesafe-config = { module = "com.typesafe:config", version = "1.4.2" } -lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" } -jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } -rxjava3 = { module = "io.reactivex.rxjava3:rxjava", version = "3.0.11" } -google-re2j = { module = "com.google.re2j:re2j", version = "1.6" } seancfoley-ipaddress = { module = "com.github.seancfoley:ipaddress", version = "5.3.4" } - -grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" } -grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } -grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" } -grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" } -grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" } -protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" } -protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" } -gson = { module = "com.google.code.gson:gson", version.ref = "gson" } - -kafka-bom = { module = "org.hypertrace.core.kafkastreams.framework:kafka-bom", version.ref = "kafka-streams-framework"} -kafka-clients = { module = "org.apache.kafka:kafka-clients"} - -slf4j-log4jimpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.17.2" } -slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.30" } - - -junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } - -mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } -mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } -mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" } - -[bundles] -grpc-api = ["grpc-stub", "grpc-protobuf", "javax-annotation", "protobuf-java"] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..7f93135c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af7be50b..8838ba97 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882e..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/label-application-rule-config-service-api/build.gradle.kts b/label-application-rule-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/label-application-rule-config-service-api/build.gradle.kts +++ b/label-application-rule-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/label-application-rule-config-service-api/gradle.lockfile b/label-application-rule-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/label-application-rule-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/label-application-rule-config-service-impl/build.gradle.kts b/label-application-rule-config-service-impl/build.gradle.kts index 64a5d4b9..ec3dc244 100644 --- a/label-application-rule-config-service-impl/build.gradle.kts +++ b/label-application-rule-config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -11,17 +11,17 @@ dependencies { implementation(projects.validationUtils) implementation(projects.configProtoConverter) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.typesafe.config) - implementation(libs.protobuf.javautil) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) + implementation(commonLibs.typesafe.config) + implementation(commonLibs.protobuf.javautil) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/label-application-rule-config-service-impl/gradle.lockfile b/label-application-rule-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..7d217611 --- /dev/null +++ b/label-application-rule-config-service-impl/gradle.lockfile @@ -0,0 +1,49 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/labels-config-service-api/build.gradle.kts b/labels-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/labels-config-service-api/build.gradle.kts +++ b/labels-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/labels-config-service-api/gradle.lockfile b/labels-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/labels-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/labels-config-service-impl/build.gradle.kts b/labels-config-service-impl/build.gradle.kts index aa870a0d..ce3f55d7 100644 --- a/labels-config-service-impl/build.gradle.kts +++ b/labels-config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -9,24 +9,24 @@ dependencies { implementation(projects.objectStore) implementation(projects.configProtoConverter) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.typesafe.config) - implementation(libs.protobuf.javautil) - implementation(libs.slf4j.api) - implementation(libs.guava) - implementation(libs.rholder.guava.retrying) - implementation(libs.rxjava3) + implementation(commonLibs.typesafe.config) + implementation(commonLibs.protobuf.javautil) + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.guava) + implementation(commonLibs.rholder.guava.retrying) + implementation(commonLibs.rxjava3) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) - implementation(libs.hypertrace.grpcutils.rxserver) - implementation(libs.hypertrace.grpcutils.rxclient) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) + implementation(commonLibs.hypertrace.grpcutils.rx.server) + implementation(commonLibs.hypertrace.grpcutils.rx.client) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/labels-config-service-impl/gradle.lockfile b/labels-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..e375afe4 --- /dev/null +++ b/labels-config-service-impl/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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/notification-channel-config-service-api/build.gradle.kts b/notification-channel-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/notification-channel-config-service-api/build.gradle.kts +++ b/notification-channel-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/notification-channel-config-service-api/gradle.lockfile b/notification-channel-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/notification-channel-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/notification-channel-config-service-impl/build.gradle.kts b/notification-channel-config-service-impl/build.gradle.kts index 22cc336c..31ac6d5c 100644 --- a/notification-channel-config-service-impl/build.gradle.kts +++ b/notification-channel-config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -12,16 +12,16 @@ dependencies { implementation(projects.validationUtils) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) - implementation(libs.slf4j.api) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) + implementation(commonLibs.slf4j2.api) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.protobuf.javautil) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.protobuf.javautil) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/notification-channel-config-service-impl/gradle.lockfile b/notification-channel-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..71453f9d --- /dev/null +++ b/notification-channel-config-service-impl/gradle.lockfile @@ -0,0 +1,48 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/notification-rule-config-service-api/build.gradle.kts b/notification-rule-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/notification-rule-config-service-api/build.gradle.kts +++ b/notification-rule-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/notification-rule-config-service-api/gradle.lockfile b/notification-rule-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/notification-rule-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/notification-rule-config-service-impl/build.gradle.kts b/notification-rule-config-service-impl/build.gradle.kts index 0138f285..3c5c8392 100644 --- a/notification-rule-config-service-impl/build.gradle.kts +++ b/notification-rule-config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -12,15 +12,15 @@ dependencies { implementation(projects.validationUtils) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) - implementation(libs.slf4j.api) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) + implementation(commonLibs.slf4j2.api) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/notification-rule-config-service-impl/gradle.lockfile b/notification-rule-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..71453f9d --- /dev/null +++ b/notification-rule-config-service-impl/gradle.lockfile @@ -0,0 +1,48 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/object-store/build.gradle.kts b/object-store/build.gradle.kts index a828f9a4..62bbad37 100644 --- a/object-store/build.gradle.kts +++ b/object-store/build.gradle.kts @@ -1,28 +1,27 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { api(projects.configServiceApi) api(projects.configServiceChangeEventApi) - api(libs.hypertrace.grpcutils.context) + api(commonLibs.hypertrace.grpcutils.context) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.slf4j.api) + implementation(commonLibs.slf4j2.api) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) - testImplementation(libs.mockito.inline) - testImplementation(libs.protobuf.javautil) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) + testImplementation(commonLibs.protobuf.javautil) - testAnnotationProcessor(libs.lombok) - testCompileOnly(libs.lombok) + testAnnotationProcessor(commonLibs.lombok) + testCompileOnly(commonLibs.lombok) } tasks.test { diff --git a/object-store/gradle.lockfile b/object-store/gradle.lockfile new file mode 100644 index 00000000..6d5edd9f --- /dev/null +++ b/object-store/gradle.lockfile @@ -0,0 +1,45 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/partitioner-config-service-api/build.gradle.kts b/partitioner-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/partitioner-config-service-api/build.gradle.kts +++ b/partitioner-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/partitioner-config-service-api/gradle.lockfile b/partitioner-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/partitioner-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/partitioner-config-service-impl/build.gradle.kts b/partitioner-config-service-impl/build.gradle.kts index ee976e71..b03617fe 100644 --- a/partitioner-config-service-impl/build.gradle.kts +++ b/partitioner-config-service-impl/build.gradle.kts @@ -1,24 +1,24 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { api(projects.partitionerConfigServiceApi) - implementation(libs.protobuf.javautil) + implementation(commonLibs.protobuf.javautil) - implementation(libs.guice) - implementation(libs.slf4j.api) - implementation(libs.typesafe.config) - implementation(libs.hypertrace.documentstore) + implementation(commonLibs.guice) + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.typesafe.config) + implementation(commonLibs.hypertrace.documentstore) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/partitioner-config-service-impl/gradle.lockfile b/partitioner-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..1529a846 --- /dev/null +++ b/partitioner-config-service-impl/gradle.lockfile @@ -0,0 +1,47 @@ +# 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. +aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-logging:commons-logging:1.2=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +javax.inject:javax.inject:1=compileClasspath,runtimeClasspath +net.jodah:failsafe:2.4.4=runtimeClasspath +org.apache.commons:commons-collections4:4.4=runtimeClasspath +org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath +org.apache.commons:commons-lang3:3.12.0=runtimeClasspath +org.apache.commons:commons-pool2:2.10.0=runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.documentstore:document-store:0.7.44=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.mongodb:bson-record-codec:4.9.0=runtimeClasspath +org.mongodb:bson:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-core:4.9.0=runtimeClasspath +org.mongodb:mongodb-driver-sync:4.9.0=runtimeClasspath +org.postgresql:postgresql:42.5.4=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +empty= diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile new file mode 100644 index 00000000..a3061376 --- /dev/null +++ b/settings-gradle.lockfile @@ -0,0 +1,5 @@ +# 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. +org.hypertrace.bom:hypertrace-version-catalog:0.2.9=incomingCatalogForCommonLibs0 +empty=incomingCatalogForLibs0 diff --git a/settings.gradle.kts b/settings.gradle.kts index 51136227..75af78db 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,9 +10,9 @@ pluginManagement { plugins { id("org.hypertrace.version-settings") version "0.2.0" + id("org.hypertrace.dependency-settings") version "0.1.0" } -enableFeaturePreview("VERSION_CATALOGS") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") include(":config-service-change-event-api") diff --git a/spaces-config-service-api/build.gradle.kts b/spaces-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/spaces-config-service-api/build.gradle.kts +++ b/spaces-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/spaces-config-service-api/gradle.lockfile b/spaces-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/spaces-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/spaces-config-service-impl/build.gradle.kts b/spaces-config-service-impl/build.gradle.kts index a184b722..73f31cfc 100644 --- a/spaces-config-service-impl/build.gradle.kts +++ b/spaces-config-service-impl/build.gradle.kts @@ -1,24 +1,24 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { api(projects.spacesConfigServiceApi) implementation(projects.configServiceApi) implementation(projects.configProtoConverter) - implementation(libs.guava) - implementation(libs.rxjava3) + implementation(commonLibs.guava) + implementation(commonLibs.rxjava3) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) - implementation(libs.hypertrace.grpcutils.rxserver) - implementation(libs.hypertrace.grpcutils.rxclient) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) + implementation(commonLibs.hypertrace.grpcutils.rx.server) + implementation(commonLibs.hypertrace.grpcutils.rx.client) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/spaces-config-service-impl/gradle.lockfile b/spaces-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..1de93366 --- /dev/null +++ b/spaces-config-service-impl/gradle.lockfile @@ -0,0 +1,43 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath +empty=annotationProcessor diff --git a/span-processing-config-service-api/build.gradle.kts b/span-processing-config-service-api/build.gradle.kts index b434ab6f..ccdb1421 100644 --- a/span-processing-config-service-api/build.gradle.kts +++ b/span-processing-config-service-api/build.gradle.kts @@ -1,23 +1,18 @@ -import com.google.protobuf.gradle.generateProtoTasks import com.google.protobuf.gradle.id -import com.google.protobuf.gradle.ofSourceSet -import com.google.protobuf.gradle.plugins -import com.google.protobuf.gradle.protobuf -import com.google.protobuf.gradle.protoc plugins { `java-library` - id("com.google.protobuf") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.google.protobuf) + alias(commonLibs.plugins.hypertrace.publish) } protobuf { protoc { - artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" + artifact = "com.google.protobuf:protoc:${commonLibs.versions.protoc.get()}" } plugins { id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" + artifact = "io.grpc:protoc-gen-grpc-java:${commonLibs.versions.grpc.get()}" } } generateProtoTasks { @@ -30,12 +25,7 @@ protobuf { } dependencies { - api(libs.bundles.grpc.api) - constraints { - implementation("com.google.guava:guava:32.1.2-jre") { - because("https://nvd.nist.gov/vuln/detail/CVE-2023-2976") - } - } + api(commonLibs.bundles.grpc.api) } sourceSets { diff --git a/span-processing-config-service-api/gradle.lockfile b/span-processing-config-service-api/gradle.lockfile new file mode 100644 index 00000000..2d594019 --- /dev/null +++ b/span-processing-config-service-api/gradle.lockfile @@ -0,0 +1,23 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +empty=annotationProcessor diff --git a/span-processing-config-service-impl/build.gradle.kts b/span-processing-config-service-impl/build.gradle.kts index d2f24da4..18c5a433 100644 --- a/span-processing-config-service-impl/build.gradle.kts +++ b/span-processing-config-service-impl/build.gradle.kts @@ -1,7 +1,7 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) } dependencies { @@ -12,22 +12,22 @@ dependencies { implementation(projects.configProtoConverter) implementation(projects.configServiceChangeEventGenerator) - implementation(libs.protobuf.javautil) - implementation(libs.google.re2j) - implementation(libs.hypertrace.grpcutils.context) - implementation(libs.hypertrace.grpcutils.client) + implementation(commonLibs.protobuf.javautil) + implementation(commonLibs.google.re2j) + implementation(commonLibs.hypertrace.grpcutils.context) + implementation(commonLibs.hypertrace.grpcutils.client) - implementation(libs.guice) - implementation(libs.guava) - implementation(libs.slf4j.api) - implementation(libs.typesafe.config) + implementation(commonLibs.guice) + implementation(commonLibs.guava) + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.typesafe.config) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/span-processing-config-service-impl/gradle.lockfile b/span-processing-config-service-impl/gradle.lockfile new file mode 100644 index 00000000..52f27705 --- /dev/null +++ b/span-processing-config-service-impl/gradle.lockfile @@ -0,0 +1,54 @@ +# 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. +aopalliance:aopalliance:1.0=compileClasspath,runtimeClasspath +com.auth0:java-jwt:4.4.0=runtimeClasspath +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.luben:zstd-jni:1.5.2-1=runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath +com.typesafe:config:1.4.2=compileClasspath,runtimeClasspath +commons-io:commons-io:2.7=runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +io.netty:netty-bom:4.1.100.Final=compileClasspath,runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +javax.inject:javax.inject:1=compileClasspath,runtimeClasspath +org.apache.kafka:kafka-clients:7.4.0-ccs=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.eventstore:event-store:0.1.3=runtimeClasspath +org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.lz4:lz4-java:1.8.0=runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +org.xerial.snappy:snappy-java:1.1.10.5=runtimeClasspath +empty= diff --git a/span-processing-utils/build.gradle.kts b/span-processing-utils/build.gradle.kts index 29f5684a..1f589aab 100644 --- a/span-processing-utils/build.gradle.kts +++ b/span-processing-utils/build.gradle.kts @@ -1,21 +1,21 @@ plugins { `java-library` jacoco - id("org.hypertrace.jacoco-report-plugin") - id("org.hypertrace.publish-plugin") + alias(commonLibs.plugins.hypertrace.jacoco) + alias(commonLibs.plugins.hypertrace.publish) } dependencies { api(projects.spanProcessingConfigServiceApi) - implementation(libs.slf4j.api) - implementation(libs.google.re2j) + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.google.re2j) - annotationProcessor(libs.lombok) - compileOnly(libs.lombok) + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation(libs.junit.jupiter) - testImplementation(libs.mockito.core) - testImplementation(libs.mockito.junit) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) testImplementation(testFixtures(projects.configServiceApi)) } diff --git a/span-processing-utils/gradle.lockfile b/span-processing-utils/gradle.lockfile new file mode 100644 index 00000000..dabeb732 --- /dev/null +++ b/span-processing-utils/gradle.lockfile @@ -0,0 +1,26 @@ +# 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.15.2=compileClasspath,runtimeClasspath +com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-protobuf:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-stub:1.57.2=compileClasspath,runtimeClasspath +javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath +empty= diff --git a/validation-utils/build.gradle.kts b/validation-utils/build.gradle.kts index 3697687f..8f354ab0 100644 --- a/validation-utils/build.gradle.kts +++ b/validation-utils/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - api(libs.hypertrace.grpcutils.context) - api(libs.grpc.api) - implementation(libs.protobuf.javautil) + api(commonLibs.hypertrace.grpcutils.context) + api(commonLibs.grpc.api) + implementation(commonLibs.protobuf.javautil) implementation(libs.seancfoley.ipaddress) } diff --git a/validation-utils/gradle.lockfile b/validation-utils/gradle.lockfile new file mode 100644 index 00000000..7126b4cc --- /dev/null +++ b/validation-utils/gradle.lockfile @@ -0,0 +1,34 @@ +# 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 +com.auth0:jwks-rsa:0.22.0=runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +com.github.seancfoley:ipaddress:5.3.4=compileClasspath,runtimeClasspath +com.google.android:annotations:4.1.1.4=runtimeClasspath +com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath +com.google.code.gson:gson:2.10.1=runtimeClasspath +com.google.code.gson:gson:2.8.9=compileClasspath +com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,runtimeClasspath +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath +com.google.guava:guava-parent:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:guava:32.1.2-jre=compileClasspath,runtimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java-util:3.24.1=compileClasspath,runtimeClasspath +com.google.protobuf:protobuf-java:3.24.1=compileClasspath,runtimeClasspath +io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +io.grpc:grpc-context:1.57.2=runtimeClasspath +io.grpc:grpc-core:1.57.2=runtimeClasspath +io.perfmark:perfmark-api:0.26.0=runtimeClasspath +org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.23=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=compileClasspath,runtimeClasspath +org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:2.0.7=runtimeClasspath +empty=annotationProcessor