From 0c71e6397852e63fa4f69708d40aa592030988ba Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 1 Nov 2023 19:45:31 -0400 Subject: [PATCH] refactor: migrate to bom --- build.gradle.kts | 10 ----- gradle/libs.versions.toml | 5 +++ .../gradle.lockfile | 8 ++-- .../build.gradle.kts | 4 +- .../gradle.lockfile | 12 ++--- .../build.gradle.kts | 24 +++++----- .../gradle.lockfile | 13 +++--- .../build.gradle.kts | 18 ++++---- .../gradle.lockfile | 13 +++--- .../build.gradle.kts | 18 ++++---- .../gradle.lockfile | 9 ++-- .../build.gradle.kts | 22 ++++----- .../gradle.lockfile | 9 ++-- .../build.gradle.kts | 12 ++--- .../gradle.lockfile | 14 +++--- .../build.gradle.kts | 28 ++++++------ .../gradle.lockfile | 8 ++-- hypertrace-core-graphql-impl/build.gradle.kts | 14 +++--- hypertrace-core-graphql-impl/gradle.lockfile | 14 +++--- .../build.gradle.kts | 30 ++++++------- .../gradle.lockfile | 15 +++---- .../build.gradle.kts | 20 ++++----- .../gradle.lockfile | 13 +++--- .../build.gradle.kts | 45 ------------------- .../build.gradle.kts | 10 ++--- .../gradle.lockfile | 12 ++--- .../build.gradle.kts | 6 +-- .../gradle.lockfile | 8 ++-- .../build.gradle.kts | 14 +++--- .../gradle.lockfile | 8 ++-- .../build.gradle.kts | 14 +++--- .../gradle.lockfile | 9 ++-- .../build.gradle.kts | 12 +++-- .../gradle.lockfile | 11 ++--- .../build.gradle.kts | 34 +++++++------- .../gradle.lockfile | 15 +++---- hypertrace-core-graphql-spi/build.gradle.kts | 6 +-- hypertrace-core-graphql-spi/gradle.lockfile | 8 ++-- .../build.gradle.kts | 11 ----- .../build.gradle.kts | 18 ++++---- .../gradle.lockfile | 15 +++---- settings.gradle.kts | 4 +- 42 files changed, 260 insertions(+), 333 deletions(-) create mode 100644 gradle/libs.versions.toml delete mode 100644 hypertrace-core-graphql-platform/build.gradle.kts delete mode 100644 hypertrace-core-graphql-test-platform/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index c0faade4..e44512e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,16 +13,6 @@ subprojects { targetCompatibility = JavaVersion.VERSION_11 } } - - pluginManager.withPlugin("java-library") { - dependencies { - "api"(platform(project(":hypertrace-core-graphql-platform"))) - "annotationProcessor"(platform(project(":hypertrace-core-graphql-platform"))) - "testAnnotationProcessor"(platform(project(":hypertrace-core-graphql-platform"))) - "testImplementation"(platform(project(":hypertrace-core-graphql-test-platform"))) - "compileOnly"(platform(project(":hypertrace-core-graphql-platform"))) - } - } } dependencyCheck { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..49706fcb --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,5 @@ + +[libraries] +graphql-annotations = { module = "io.github.graphql-java:graphql-java-annotations", version = "9.1" } +graphql-servlet = { module = "com.graphql-java-kickstart:graphql-java-servlet", version = "14.0.0" } +opentelemetry-proto = { module = "io.opentelemetry:opentelemetry-proto", version = "1.1.0-alpha" } diff --git a/hypertrace-core-graphql-attribute-scope-constants/gradle.lockfile b/hypertrace-core-graphql-attribute-scope-constants/gradle.lockfile index 6e05c2a1..98ad50f0 100644 --- a/hypertrace-core-graphql-attribute-scope-constants/gradle.lockfile +++ b/hypertrace-core-graphql-attribute-scope-constants/gradle.lockfile @@ -1,8 +1,8 @@ # 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=annotationProcessor,compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-attribute-scope/build.gradle.kts b/hypertrace-core-graphql-attribute-scope/build.gradle.kts index 0cb15779..227f1630 100644 --- a/hypertrace-core-graphql-attribute-scope/build.gradle.kts +++ b/hypertrace-core-graphql-attribute-scope/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("io.reactivex.rxjava3:rxjava") + api(commonLibs.guice) + api(commonLibs.rxjava3) api(projects.hypertraceCoreGraphqlAttributeStore) api(projects.hypertraceCoreGraphqlCommonSchema) // These are kept in a separate project so they can be referenced by other projects without circular dependencies diff --git a/hypertrace-core-graphql-attribute-scope/gradle.lockfile b/hypertrace-core-graphql-attribute-scope/gradle.lockfile index da8c1fa1..b677fbe6 100644 --- a/hypertrace-core-graphql-attribute-scope/gradle.lockfile +++ b/hypertrace-core-graphql-attribute-scope/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath @@ -29,7 +29,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=runtimeClasspath @@ -46,13 +46,13 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=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=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-attribute-store/build.gradle.kts b/hypertrace-core-graphql-attribute-store/build.gradle.kts index 781eab38..d2f29aa2 100644 --- a/hypertrace-core-graphql-attribute-store/build.gradle.kts +++ b/hypertrace-core-graphql-attribute-store/build.gradle.kts @@ -5,26 +5,26 @@ plugins { } dependencies { - api("com.google.inject:guice") + api(commonLibs.guice) api(projects.hypertraceCoreGraphqlSpi) api(projects.hypertraceCoreGraphqlContext) - implementation("org.slf4j:slf4j-api") - implementation("io.reactivex.rxjava3:rxjava") - implementation("com.google.guava:guava") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.rxjava3) + implementation(commonLibs.guava) - implementation("org.hypertrace.core.attribute.service:caching-attribute-service-client") - implementation("org.hypertrace.core.attribute.service:attribute-service-api") - implementation("org.hypertrace.core.grpcutils:grpc-client-rx-utils") + implementation(commonLibs.hypertrace.attributeservice.cachingclient) + implementation(commonLibs.hypertrace.attributeservice.api) + implementation(commonLibs.hypertrace.grpcutils.rx.client) implementation(projects.hypertraceCoreGraphqlGrpcUtils) implementation(projects.hypertraceCoreGraphqlRxUtils) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-attribute-store/gradle.lockfile b/hypertrace-core-graphql-attribute-store/gradle.lockfile index 3791ef77..67d47377 100644 --- a/hypertrace-core-graphql-attribute-store/gradle.lockfile +++ b/hypertrace-core-graphql-attribute-store/gradle.lockfile @@ -8,7 +8,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,runtimeCl 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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 @@ -28,7 +28,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=compileClasspath,runtimeClasspath io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath @@ -45,15 +45,14 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=compileClasspath,runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=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=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.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +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 empty= diff --git a/hypertrace-core-graphql-common-schema/build.gradle.kts b/hypertrace-core-graphql-common-schema/build.gradle.kts index 2258f1d1..168495a4 100644 --- a/hypertrace-core-graphql-common-schema/build.gradle.kts +++ b/hypertrace-core-graphql-common-schema/build.gradle.kts @@ -5,24 +5,24 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.graphql.java) api(projects.hypertraceCoreGraphqlAttributeStore) api(projects.hypertraceCoreGraphqlContext) - api("io.reactivex.rxjava3:rxjava") - api("io.github.graphql-java:graphql-java-annotations") + api(commonLibs.rxjava3) + api(localLibs.graphql.annotations) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) compileOnly(projects.hypertraceCoreGraphqlAttributeScopeConstants) implementation(projects.hypertraceCoreGraphqlDeserialization) implementation(projects.hypertraceCoreGraphqlSchemaUtils) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-common-schema/gradle.lockfile b/hypertrace-core-graphql-common-schema/gradle.lockfile index a33beda4..3186cd16 100644 --- a/hypertrace-core-graphql-common-schema/gradle.lockfile +++ b/hypertrace-core-graphql-common-schema/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath @@ -29,7 +29,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=runtimeClasspath @@ -46,15 +46,14 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +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 empty= diff --git a/hypertrace-core-graphql-context/build.gradle.kts b/hypertrace-core-graphql-context/build.gradle.kts index a9e8d676..02ee6d2c 100644 --- a/hypertrace-core-graphql-context/build.gradle.kts +++ b/hypertrace-core-graphql-context/build.gradle.kts @@ -5,19 +5,19 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") - api("com.graphql-java-kickstart:graphql-java-servlet") + api(commonLibs.guice) + api(commonLibs.graphql.java) + api(localLibs.graphql.servlet) implementation(projects.hypertraceCoreGraphqlSpi) - implementation("com.google.guava:guava") + implementation(commonLibs.guava) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-context/gradle.lockfile b/hypertrace-core-graphql-context/gradle.lockfile index 81fc7cd1..aef72af9 100644 --- a/hypertrace-core-graphql-context/gradle.lockfile +++ b/hypertrace-core-graphql-context/gradle.lockfile @@ -6,7 +6,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,runtimeCl 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=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 @@ -21,17 +21,16 @@ com.graphql-java:graphql-java-extended-scalars:17.0=compileClasspath,runtimeClas com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath javax.servlet:javax.servlet-api:4.0.1=compileClasspath,runtimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=compileClasspath,runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath empty= diff --git a/hypertrace-core-graphql-deserialization/build.gradle.kts b/hypertrace-core-graphql-deserialization/build.gradle.kts index bd38d703..d2164986 100644 --- a/hypertrace-core-graphql-deserialization/build.gradle.kts +++ b/hypertrace-core-graphql-deserialization/build.gradle.kts @@ -5,20 +5,20 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.fasterxml.jackson.core:jackson-databind") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.jackson.databind) + api(commonLibs.graphql.java) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8") - implementation("org.slf4j:slf4j-api") + implementation(commonLibs.jackson.datatype.jsr310) + implementation(commonLibs.jackson.datatype.jdk8) + implementation(commonLibs.slf4j2.api) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-deserialization/gradle.lockfile b/hypertrace-core-graphql-deserialization/gradle.lockfile index ef3407ab..c4f405d1 100644 --- a/hypertrace-core-graphql-deserialization/gradle.lockfile +++ b/hypertrace-core-graphql-deserialization/gradle.lockfile @@ -7,7 +7,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=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 @@ -18,14 +18,13 @@ com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath empty= diff --git a/hypertrace-core-graphql-gateway-service-utils/build.gradle.kts b/hypertrace-core-graphql-gateway-service-utils/build.gradle.kts index df7df90d..40016ea4 100644 --- a/hypertrace-core-graphql-gateway-service-utils/build.gradle.kts +++ b/hypertrace-core-graphql-gateway-service-utils/build.gradle.kts @@ -5,16 +5,16 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("org.hypertrace.gateway.service:gateway-service-api") + api(commonLibs.guice) + api(commonLibs.hypertrace.gatewayservice.api) api(projects.hypertraceCoreGraphqlAttributeStore) - api("io.reactivex.rxjava3:rxjava") + api(commonLibs.rxjava3) api(projects.hypertraceCoreGraphqlCommonSchema) implementation(projects.hypertraceCoreGraphqlGrpcUtils) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-gateway-service-utils/gradle.lockfile b/hypertrace-core-graphql-gateway-service-utils/gradle.lockfile index 4c151db4..8a5a5298 100644 --- a/hypertrace-core-graphql-gateway-service-utils/gradle.lockfile +++ b/hypertrace-core-graphql-gateway-service-utils/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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 @@ -29,7 +29,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=compileClasspath,runtimeClasspath io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath @@ -46,14 +46,14 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=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.hypertrace.gateway.service:gateway-service-api:0.3.2=compileClasspath,runtimeClasspath +org.hypertrace.gateway.service:gateway-service-api:0.3.9=compileClasspath,runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-grpc-utils/build.gradle.kts b/hypertrace-core-graphql-grpc-utils/build.gradle.kts index bd5691ac..0cf89b3b 100644 --- a/hypertrace-core-graphql-grpc-utils/build.gradle.kts +++ b/hypertrace-core-graphql-grpc-utils/build.gradle.kts @@ -5,25 +5,25 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") - api("io.grpc:grpc-api") - api("io.grpc:grpc-core") - api("io.grpc:grpc-stub") + api(commonLibs.guice) + api(commonLibs.graphql.java) + api(commonLibs.grpc.api) + api(commonLibs.grpc.core) + api(commonLibs.grpc.stub) api(projects.hypertraceCoreGraphqlContext) - api("org.hypertrace.core.grpcutils:grpc-context-utils") + api(commonLibs.hypertrace.grpcutils.context) - implementation("org.hypertrace.core.grpcutils:grpc-client-utils") - implementation("io.grpc:grpc-context") - implementation("io.reactivex.rxjava3:rxjava") - implementation("org.slf4j:slf4j-api") + implementation(commonLibs.hypertrace.grpcutils.client) + implementation(commonLibs.grpc.context) + implementation(commonLibs.rxjava3) + implementation(commonLibs.slf4j2.api) implementation(projects.hypertraceCoreGraphqlSpi) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) - testRuntimeOnly("io.grpc:grpc-netty") + testRuntimeOnly(commonLibs.grpc.netty) } tasks.test { diff --git a/hypertrace-core-graphql-grpc-utils/gradle.lockfile b/hypertrace-core-graphql-grpc-utils/gradle.lockfile index e37b715c..c1ebc0ca 100644 --- a/hypertrace-core-graphql-grpc-utils/gradle.lockfile +++ b/hypertrace-core-graphql-grpc-utils/gradle.lockfile @@ -8,7 +8,7 @@ com.fasterxml.jackson.core:jackson-annotations:2.15.2=compileClasspath,runtimeCl 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=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 @@ -26,7 +26,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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-stub:1.57.2=compileClasspath,runtimeClasspath @@ -40,10 +40,10 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.bom:hypertrace-bom:0.2.10-SNAPSHOT=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.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=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-impl/build.gradle.kts b/hypertrace-core-graphql-impl/build.gradle.kts index d8dbd0fa..944a8bd1 100644 --- a/hypertrace-core-graphql-impl/build.gradle.kts +++ b/hypertrace-core-graphql-impl/build.gradle.kts @@ -6,8 +6,8 @@ plugins { dependencies { api(projects.hypertraceCoreGraphqlSpi) - api("com.graphql-java-kickstart:graphql-java-servlet") - api("org.hypertrace.core.grpcutils:grpc-client-utils") + api(localLibs.graphql.servlet) + api(commonLibs.hypertrace.grpcutils.client) implementation(projects.hypertraceCoreGraphqlSchemaRegistry) implementation(projects.hypertraceCoreGraphqlContext) @@ -25,12 +25,12 @@ dependencies { implementation(projects.hypertraceCoreGraphqlLogEventSchema) implementation(projects.hypertraceCoreGraphqlRequestTransformation) - implementation("org.slf4j:slf4j-api") - implementation("com.google.inject:guice") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.guice) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-impl/gradle.lockfile b/hypertrace-core-graphql-impl/gradle.lockfile index 722b2cc4..28df374a 100644 --- a/hypertrace-core-graphql-impl/gradle.lockfile +++ b/hypertrace-core-graphql-impl/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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 @@ -30,7 +30,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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 @@ -50,14 +50,14 @@ org.apache.commons:commons-lang3:3.12.0=runtimeClasspath org.apache.commons:commons-text:1.10.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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=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.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -org.hypertrace.gateway.service:gateway-service-api:0.3.2=compileClasspath,runtimeClasspath +org.hypertrace.gateway.service:gateway-service-api:0.3.9=compileClasspath,runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-log-event-schema/build.gradle.kts b/hypertrace-core-graphql-log-event-schema/build.gradle.kts index 2eb25e1c..73805999 100644 --- a/hypertrace-core-graphql-log-event-schema/build.gradle.kts +++ b/hypertrace-core-graphql-log-event-schema/build.gradle.kts @@ -3,20 +3,20 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.graphql.java) api(projects.hypertraceCoreGraphqlSpi) - api("io.github.graphql-java:graphql-java-annotations") + api(localLibs.graphql.annotations) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) compileOnly(projects.hypertraceCoreGraphqlAttributeScopeConstants) - implementation("org.slf4j:slf4j-api") - implementation("io.reactivex.rxjava3:rxjava") - implementation("org.hypertrace.gateway.service:gateway-service-api") - implementation("com.google.protobuf:protobuf-java-util") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.rxjava3) + implementation(commonLibs.hypertrace.gatewayservice.api) + implementation(commonLibs.protobuf.javautil) implementation(projects.hypertraceCoreGraphqlContext) implementation(projects.hypertraceCoreGraphqlGrpcUtils) @@ -25,14 +25,14 @@ dependencies { implementation(projects.hypertraceCoreGraphqlDeserialization) implementation(projects.hypertraceCoreGraphqlSchemaUtils) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("com.fasterxml.jackson.core:jackson-databind") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.jackson.databind) testImplementation(projects.hypertraceCoreGraphqlGatewayServiceUtils) - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) - testAnnotationProcessor("org.projectlombok:lombok") - testCompileOnly("org.projectlombok:lombok") + testAnnotationProcessor(commonLibs.lombok) + testCompileOnly(commonLibs.lombok) } tasks.test { diff --git a/hypertrace-core-graphql-log-event-schema/gradle.lockfile b/hypertrace-core-graphql-log-event-schema/gradle.lockfile index 5855e35a..18e10969 100644 --- a/hypertrace-core-graphql-log-event-schema/gradle.lockfile +++ b/hypertrace-core-graphql-log-event-schema/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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 @@ -31,7 +31,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=compileClasspath,runtimeClasspath io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath @@ -48,16 +48,15 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=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.hypertrace.gateway.service:gateway-service-api:0.3.2=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +org.hypertrace.gateway.service:gateway-service-api:0.3.9=compileClasspath,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 empty= diff --git a/hypertrace-core-graphql-metadata-schema/build.gradle.kts b/hypertrace-core-graphql-metadata-schema/build.gradle.kts index 3aabb4b0..cf412bf9 100644 --- a/hypertrace-core-graphql-metadata-schema/build.gradle.kts +++ b/hypertrace-core-graphql-metadata-schema/build.gradle.kts @@ -5,23 +5,23 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.graphql.java) api(projects.hypertraceCoreGraphqlSpi) - api("io.github.graphql-java:graphql-java-annotations") + api(localLibs.graphql.annotations) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - implementation("org.slf4j:slf4j-api") - implementation("io.reactivex.rxjava3:rxjava") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.rxjava3) implementation(projects.hypertraceCoreGraphqlContext) implementation(projects.hypertraceCoreGraphqlCommonSchema) implementation(projects.hypertraceCoreGraphqlAttributeStore) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-metadata-schema/gradle.lockfile b/hypertrace-core-graphql-metadata-schema/gradle.lockfile index a33beda4..3186cd16 100644 --- a/hypertrace-core-graphql-metadata-schema/gradle.lockfile +++ b/hypertrace-core-graphql-metadata-schema/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath @@ -29,7 +29,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=runtimeClasspath @@ -46,15 +46,14 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +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 empty= diff --git a/hypertrace-core-graphql-platform/build.gradle.kts b/hypertrace-core-graphql-platform/build.gradle.kts deleted file mode 100644 index 08afb5fc..00000000 --- a/hypertrace-core-graphql-platform/build.gradle.kts +++ /dev/null @@ -1,45 +0,0 @@ -plugins { - `java-platform` -} - -javaPlatform { - allowDependencies() -} - -val attributeServiceVersion: String = "0.14.14" - -dependencies { - api(platform("io.grpc:grpc-bom:1.57.2")) - api(platform("com.fasterxml.jackson:jackson-bom:2.15.2")) - constraints { - - api("org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6") - api("org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6") - api("org.hypertrace.gateway.service:gateway-service-api:0.3.2") - api("org.hypertrace.core.serviceframework:platform-http-service-framework:0.1.62") - api("org.hypertrace.core.attribute.service:caching-attribute-service-client:${attributeServiceVersion}") - api("org.hypertrace.core.attribute.service:attribute-service-api:${attributeServiceVersion}") - - api("com.google.inject:guice:5.1.0") - api("com.graphql-java:graphql-java:19.6") - api("io.github.graphql-java:graphql-java-annotations:9.1") - api("org.slf4j:slf4j-api:1.7.36") - api("io.reactivex.rxjava3:rxjava:3.1.6") - api("com.google.protobuf:protobuf-java-util:3.21.7") - - api("org.projectlombok:lombok:1.18.24") - api("com.google.code.findbugs:jsr305:3.0.2") - api("com.typesafe:config:1.4.2") - api("com.google.guava:guava:32.1.2-jre") - api("com.graphql-java-kickstart:graphql-java-servlet:14.0.0") - - api("com.fasterxml.jackson.core:jackson-databind") - api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") - api("com.fasterxml.jackson.datatype:jackson-datatype-jdk8") - api("org.apache.commons:commons-text:1.10.0") - api("io.opentelemetry:opentelemetry-proto:1.1.0-alpha") - - runtime("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0") - } -} diff --git a/hypertrace-core-graphql-request-transformation/build.gradle.kts b/hypertrace-core-graphql-request-transformation/build.gradle.kts index dbe0f54d..aa9d0684 100644 --- a/hypertrace-core-graphql-request-transformation/build.gradle.kts +++ b/hypertrace-core-graphql-request-transformation/build.gradle.kts @@ -5,13 +5,13 @@ plugins { } dependencies { - api("com.google.inject:guice") + api(commonLibs.guice) api(projects.hypertraceCoreGraphqlCommonSchema) - testAnnotationProcessor("org.projectlombok:lombok") - testCompileOnly("org.projectlombok:lombok") - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") + testAnnotationProcessor(commonLibs.lombok) + testCompileOnly(commonLibs.lombok) + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) } tasks.test { diff --git a/hypertrace-core-graphql-request-transformation/gradle.lockfile b/hypertrace-core-graphql-request-transformation/gradle.lockfile index da8c1fa1..b677fbe6 100644 --- a/hypertrace-core-graphql-request-transformation/gradle.lockfile +++ b/hypertrace-core-graphql-request-transformation/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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=runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath @@ -29,7 +29,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=runtimeClasspath @@ -46,13 +46,13 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6=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=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-rx-utils/build.gradle.kts b/hypertrace-core-graphql-rx-utils/build.gradle.kts index f5f4ad0c..39ebc699 100644 --- a/hypertrace-core-graphql-rx-utils/build.gradle.kts +++ b/hypertrace-core-graphql-rx-utils/build.gradle.kts @@ -3,8 +3,8 @@ plugins { } dependencies { - api("io.reactivex.rxjava3:rxjava") - api("com.google.inject:guice") + api(commonLibs.rxjava3) + api(commonLibs.guice) implementation(projects.hypertraceCoreGraphqlSpi) - implementation("com.google.guava:guava") + implementation(commonLibs.guava) } diff --git a/hypertrace-core-graphql-rx-utils/gradle.lockfile b/hypertrace-core-graphql-rx-utils/gradle.lockfile index 63b2ce2c..881b21c1 100644 --- a/hypertrace-core-graphql-rx-utils/gradle.lockfile +++ b/hypertrace-core-graphql-rx-utils/gradle.lockfile @@ -2,7 +2,7 @@ # 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:jackson-bom:2.15.2=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=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 @@ -15,14 +15,14 @@ com.graphql-java:graphql-java-extended-scalars:17.0=compileClasspath,runtimeClas com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath io.reactivex.rxjava3:rxjava:3.1.7=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=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=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-schema-registry/build.gradle.kts b/hypertrace-core-graphql-schema-registry/build.gradle.kts index d313071a..3350af49 100644 --- a/hypertrace-core-graphql-schema-registry/build.gradle.kts +++ b/hypertrace-core-graphql-schema-registry/build.gradle.kts @@ -5,17 +5,17 @@ plugins { } dependencies { - api("com.graphql-java:graphql-java") + api(commonLibs.graphql.java) - implementation("org.slf4j:slf4j-api") - implementation("com.google.inject:guice") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.guice) implementation(projects.hypertraceCoreGraphqlSpi) - implementation("io.github.graphql-java:graphql-java-annotations") + implementation(localLibs.graphql.annotations) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-schema-registry/gradle.lockfile b/hypertrace-core-graphql-schema-registry/gradle.lockfile index d7404b0a..9ef880e6 100644 --- a/hypertrace-core-graphql-schema-registry/gradle.lockfile +++ b/hypertrace-core-graphql-schema-registry/gradle.lockfile @@ -2,7 +2,7 @@ # 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:jackson-bom:2.15.2=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=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 @@ -15,13 +15,13 @@ com.graphql-java:graphql-java-extended-scalars:17.0=compileClasspath,runtimeClas com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-schema-utils/build.gradle.kts b/hypertrace-core-graphql-schema-utils/build.gradle.kts index 6ae00b72..3c5a7dac 100644 --- a/hypertrace-core-graphql-schema-utils/build.gradle.kts +++ b/hypertrace-core-graphql-schema-utils/build.gradle.kts @@ -5,15 +5,15 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.graphql.java) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) } tasks.test { diff --git a/hypertrace-core-graphql-schema-utils/gradle.lockfile b/hypertrace-core-graphql-schema-utils/gradle.lockfile index 765f33de..2ca818fb 100644 --- a/hypertrace-core-graphql-schema-utils/gradle.lockfile +++ b/hypertrace-core-graphql-schema-utils/gradle.lockfile @@ -2,7 +2,7 @@ # 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:jackson-bom:2.15.2=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=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 @@ -13,14 +13,13 @@ com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath javax.inject:javax.inject:1=compileClasspath,runtimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +org.projectlombok:lombok:1.18.28=annotationProcessor,compileClasspath org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath empty= diff --git a/hypertrace-core-graphql-service/build.gradle.kts b/hypertrace-core-graphql-service/build.gradle.kts index 38d26804..2426bb5d 100644 --- a/hypertrace-core-graphql-service/build.gradle.kts +++ b/hypertrace-core-graphql-service/build.gradle.kts @@ -6,17 +6,15 @@ plugins { } dependencies { - implementation(platform(project(":hypertrace-core-graphql-platform"))) + implementation(commonLibs.hypertrace.framework.http) + implementation(commonLibs.slf4j2.api) - implementation("org.hypertrace.core.serviceframework:platform-http-service-framework") - implementation("org.slf4j:slf4j-api") - - implementation("com.graphql-java-kickstart:graphql-java-servlet") + implementation(localLibs.graphql.servlet) implementation(projects.hypertraceCoreGraphqlImpl) implementation(projects.hypertraceCoreGraphqlSpi) - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") - runtimeOnly("io.grpc:grpc-netty") + runtimeOnly(commonLibs.log4j.slf4j2.impl) + runtimeOnly(commonLibs.grpc.netty) } application { diff --git a/hypertrace-core-graphql-service/gradle.lockfile b/hypertrace-core-graphql-service/gradle.lockfile index 4f13803e..396a2a6f 100644 --- a/hypertrace-core-graphql-service/gradle.lockfile +++ b/hypertrace-core-graphql-service/gradle.lockfile @@ -89,7 +89,8 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath org.apache.httpcomponents:httpcore:4.4.13=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.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-continuation:9.4.53.v20231009=runtimeClasspath @@ -102,9 +103,9 @@ org.eclipse.jetty:jetty-servlets: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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=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 @@ -113,7 +114,7 @@ org.hypertrace.core.serviceframework:platform-http-service-framework:0.1.62=comp 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.hypertrace.gateway.service:gateway-service-api:0.3.2=runtimeClasspath +org.hypertrace.gateway.service:gateway-service-api:0.3.9=runtimeClasspath org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath org.reactivestreams:reactive-streams:1.0.3=compileClasspath org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath diff --git a/hypertrace-core-graphql-span-schema/build.gradle.kts b/hypertrace-core-graphql-span-schema/build.gradle.kts index 01e02380..ba4fd0c4 100644 --- a/hypertrace-core-graphql-span-schema/build.gradle.kts +++ b/hypertrace-core-graphql-span-schema/build.gradle.kts @@ -3,22 +3,22 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.graphql.java) api(projects.hypertraceCoreGraphqlSpi) - api("io.github.graphql-java:graphql-java-annotations") + api(localLibs.graphql.annotations) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) compileOnly(projects.hypertraceCoreGraphqlAttributeScopeConstants) - implementation("org.slf4j:slf4j-api") - implementation("io.reactivex.rxjava3:rxjava") - implementation("org.hypertrace.gateway.service:gateway-service-api") - implementation("com.google.protobuf:protobuf-java-util") - implementation("io.opentelemetry:opentelemetry-proto") - implementation("org.apache.commons:commons-text") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.rxjava3) + implementation(commonLibs.hypertrace.gatewayservice.api) + implementation(commonLibs.protobuf.javautil) + implementation(localLibs.opentelemetry.proto) + implementation(commonLibs.commons.text) implementation(projects.hypertraceCoreGraphqlContext) implementation(projects.hypertraceCoreGraphqlGrpcUtils) @@ -30,14 +30,14 @@ dependencies { implementation(projects.hypertraceCoreGraphqlAttributeScopeConstants) implementation(projects.hypertraceCoreGraphqlRequestTransformation) - testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("com.fasterxml.jackson.core:jackson-databind") + testImplementation(commonLibs.junit.jupiter) + testImplementation(commonLibs.jackson.databind) testImplementation(projects.hypertraceCoreGraphqlGatewayServiceUtils) - testImplementation("org.mockito:mockito-core") - testImplementation("org.mockito:mockito-junit-jupiter") + testImplementation(commonLibs.mockito.core) + testImplementation(commonLibs.mockito.junit) - testAnnotationProcessor("org.projectlombok:lombok") - testCompileOnly("org.projectlombok:lombok") + testAnnotationProcessor(commonLibs.lombok) + testCompileOnly(commonLibs.lombok) } tasks.test { diff --git a/hypertrace-core-graphql-span-schema/gradle.lockfile b/hypertrace-core-graphql-span-schema/gradle.lockfile index b10682ce..6d0f6637 100644 --- a/hypertrace-core-graphql-span-schema/gradle.lockfile +++ b/hypertrace-core-graphql-span-schema/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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 @@ -31,7 +31,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=compileClasspath,runtimeClasspath io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath @@ -51,16 +51,15 @@ org.apache.commons:commons-lang3:3.12.0=compileClasspath,runtimeClasspath org.apache.commons:commons-text:1.10.0=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=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.hypertrace.gateway.service:gateway-service-api:0.3.2=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +org.hypertrace.gateway.service:gateway-service-api:0.3.9=compileClasspath,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 empty= diff --git a/hypertrace-core-graphql-spi/build.gradle.kts b/hypertrace-core-graphql-spi/build.gradle.kts index 3de1e282..543f129a 100644 --- a/hypertrace-core-graphql-spi/build.gradle.kts +++ b/hypertrace-core-graphql-spi/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } dependencies { - api("com.graphql-java:graphql-java") - api("io.github.graphql-java:graphql-java-annotations") - api("com.google.code.findbugs:jsr305") + api(commonLibs.graphql.java) + api(localLibs.graphql.annotations) + api(commonLibs.jsr305) } diff --git a/hypertrace-core-graphql-spi/gradle.lockfile b/hypertrace-core-graphql-spi/gradle.lockfile index 7df3b9cc..66285197 100644 --- a/hypertrace-core-graphql-spi/gradle.lockfile +++ b/hypertrace-core-graphql-spi/gradle.lockfile @@ -1,16 +1,16 @@ # 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=annotationProcessor,compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.2=compileClasspath,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath com.graphql-java:graphql-java-extended-scalars:17.0=compileClasspath,runtimeClasspath com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,compileClasspath,runtimeClasspath +io.grpc:grpc-bom:1.57.2=compileClasspath,runtimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath -org.hypertrace.bom:hypertrace-bom:0.2.9=compileClasspath,runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.3.9=compileClasspath,runtimeClasspath org.reactivestreams:reactive-streams:1.0.3=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath -empty= +empty=annotationProcessor diff --git a/hypertrace-core-graphql-test-platform/build.gradle.kts b/hypertrace-core-graphql-test-platform/build.gradle.kts deleted file mode 100644 index 3def9244..00000000 --- a/hypertrace-core-graphql-test-platform/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - `java-platform` -} - -dependencies { - constraints { - api("org.junit.jupiter:junit-jupiter:5.7.0") - api("org.mockito:mockito-core:3.7.7") - api("org.mockito:mockito-junit-jupiter:3.7.7") - } -} diff --git a/hypertrace-core-graphql-trace-schema/build.gradle.kts b/hypertrace-core-graphql-trace-schema/build.gradle.kts index 722d6065..580afab1 100644 --- a/hypertrace-core-graphql-trace-schema/build.gradle.kts +++ b/hypertrace-core-graphql-trace-schema/build.gradle.kts @@ -3,20 +3,20 @@ plugins { } dependencies { - api("com.google.inject:guice") - api("com.graphql-java:graphql-java") + api(commonLibs.guice) + api(commonLibs.graphql.java) api(projects.hypertraceCoreGraphqlSpi) - api("io.github.graphql-java:graphql-java-annotations") + api(localLibs.graphql.annotations) - annotationProcessor("org.projectlombok:lombok") - compileOnly("org.projectlombok:lombok") + annotationProcessor(commonLibs.lombok) + compileOnly(commonLibs.lombok) compileOnly(projects.hypertraceCoreGraphqlAttributeScopeConstants) - implementation("org.slf4j:slf4j-api") - implementation("io.reactivex.rxjava3:rxjava") - implementation("org.hypertrace.gateway.service:gateway-service-api") - implementation("com.google.protobuf:protobuf-java-util") + implementation(commonLibs.slf4j2.api) + implementation(commonLibs.rxjava3) + implementation(commonLibs.hypertrace.gatewayservice.api) + implementation(commonLibs.protobuf.javautil) implementation(projects.hypertraceCoreGraphqlContext) implementation(projects.hypertraceCoreGraphqlGrpcUtils) diff --git a/hypertrace-core-graphql-trace-schema/gradle.lockfile b/hypertrace-core-graphql-trace-schema/gradle.lockfile index 5855e35a..18e10969 100644 --- a/hypertrace-core-graphql-trace-schema/gradle.lockfile +++ b/hypertrace-core-graphql-trace-schema/gradle.lockfile @@ -9,7 +9,7 @@ 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.datatype:jackson-datatype-jdk8:2.15.2=compileClasspath,runtimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.2=annotationProcessor,compileClasspath,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 @@ -31,7 +31,7 @@ com.graphql-java:graphql-java:19.6=compileClasspath,runtimeClasspath com.graphql-java:java-dataloader:3.2.0=compileClasspath,runtimeClasspath io.github.graphql-java:graphql-java-annotations:9.1=compileClasspath,runtimeClasspath io.grpc:grpc-api:1.57.2=compileClasspath,runtimeClasspath -io.grpc:grpc-bom:1.57.2=annotationProcessor,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=compileClasspath,runtimeClasspath io.grpc:grpc-protobuf-lite:1.57.2=compileClasspath,runtimeClasspath @@ -48,16 +48,15 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath javax.websocket:javax.websocket-api:1.1=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.attribute.service:attribute-service-api:0.14.14=runtimeClasspath -org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.14=runtimeClasspath +org.hypertrace.bom:hypertrace-bom:0.2.10-SNAPSHOT=compileClasspath,runtimeClasspath +org.hypertrace.core.attribute.service:attribute-service-api:0.14.35=runtimeClasspath +org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.35=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.12.6=runtimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6=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.hypertrace.gateway.service:gateway-service-api:0.3.2=compileClasspath,runtimeClasspath -org.projectlombok:lombok:1.18.24=annotationProcessor -org.projectlombok:lombok:1.18.28=compileClasspath +org.hypertrace.gateway.service:gateway-service-api:0.3.9=compileClasspath,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 empty= diff --git a/settings.gradle.kts b/settings.gradle.kts index 940ee353..c92abf93 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ plugins { } configure { - catalogVersion.set("0.2.9") + catalogVersion.set("0.2.10") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") @@ -38,7 +38,5 @@ include(":hypertrace-core-graphql-trace-schema") include(":hypertrace-core-graphql-attribute-scope") include(":hypertrace-core-graphql-attribute-scope-constants") include(":hypertrace-core-graphql-rx-utils") -include(":hypertrace-core-graphql-platform") -include(":hypertrace-core-graphql-test-platform") include(":hypertrace-core-graphql-log-event-schema") include(":hypertrace-core-graphql-request-transformation") \ No newline at end of file