From a3ad0b5d98e573ed116e8f9b1c3b5176ae7f4dea Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Wed, 1 Nov 2023 18:06:59 -0400 Subject: [PATCH] refactor: add more dependencies to support porting gql --- gradle/libs.versions.toml | 11 +++++++++++ hypertrace-bom/build.gradle.kts | 6 ++++++ test-consumer/build.gradle.kts | 9 +++++++++ 3 files changed, 26 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bf38784..291aafa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,8 @@ hypertrace-framework = "0.1.62" hypertrace-grpcutils = "0.12.6" hypertrace-kafka = "0.3.9" hypertrace-bom = "+" +hypertrace-attributeservice = "0.14.35" +hypertrace-gatewayservice = "0.3.9" junit = "5.10.0" mockito = "5.5.0" @@ -22,8 +24,11 @@ grpc-stub = { module = "io.grpc:grpc-stub" } grpc-protobuf = { module = "io.grpc:grpc-protobuf" } grpc-api = { module = "io.grpc:grpc-api" } grpc-netty = { module = "io.grpc:grpc-netty" } +grpc-context = { module = "io.grpc:grpc-context" } jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version = "2.15.2" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" } +jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" } +jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" } protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" } protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" } slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.7" } @@ -31,6 +36,9 @@ log4j-slf4j2-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", ver javax-annotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" } rxjava3 = { module = "io.reactivex.rxjava3:rxjava", version = "3.1.7" } uuidcreator = { module = "com.github.f4b6a3:uuid-creator", version = "5.3.2" } +commons-text = { module = "org.apache.commons:commons-text", version = "1.10.0" } +graphql-java = { module = "com.graphql-java:graphql-java", version = "19.6" } +jsr305 = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } kafka-clients = { module = "org.apache.kafka:kafka-clients" } @@ -47,6 +55,9 @@ hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:documen hypertrace-eventstore = { module = "org.hypertrace.core.eventstore:event-store", version = "0.1.3" } hypertrace-kafka-bom = { module = "org.hypertrace.core.kafkastreams.framework:kafka-bom", version.ref = "hypertrace-kafka" } hypertrace-kafka-framework = { module = "org.hypertrace.core.kafkastreams.framework:kafka-streams-framework", version.ref = "hypertrace-kafka" } +hypertrace-attributeservice-api = { module = "org.hypertrace.core.attribute.service:attribute-service-api", version.ref = "hypertrace-attributeservice" } +hypertrace-attributeservice-cachingclient = { module = "org.hypertrace.core.attribute.service:caching-attribute-service-client", version.ref = "hypertrace-attributeservice" } +hypertrace-gatewayservice-api = { module = "org.hypertrace.gateway.service:gateway-service-api", version.ref = "hypertrace-gatewayservice" } hypertrace-bom = { module = "org.hypertrace.bom:hypertrace-bom", version.ref = "hypertrace-bom" } junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } diff --git a/hypertrace-bom/build.gradle.kts b/hypertrace-bom/build.gradle.kts index e960c19..e6c6a3f 100644 --- a/hypertrace-bom/build.gradle.kts +++ b/hypertrace-bom/build.gradle.kts @@ -23,6 +23,9 @@ dependencies { api(libs.hypertrace.documentstore) api(libs.hypertrace.framework.documentstore.metrics) api(libs.hypertrace.eventstore) + api(libs.hypertrace.attributeservice.api) + api(libs.hypertrace.attributeservice.cachingclient) + api(libs.hypertrace.gatewayservice.api) api(libs.guava) api(libs.google.re2j) @@ -37,5 +40,8 @@ dependencies { api(libs.kafka.clients) api(libs.slf4j2.api) api(libs.log4j.slf4j2.impl) + api(libs.commons.text) + api(libs.graphql.java) + api(libs.jsr305) } } diff --git a/test-consumer/build.gradle.kts b/test-consumer/build.gradle.kts index 071772e..7092ceb 100644 --- a/test-consumer/build.gradle.kts +++ b/test-consumer/build.gradle.kts @@ -16,6 +16,9 @@ dependencies { api(libs.hypertrace.framework.documentstore.metrics) api(libs.hypertrace.documentstore) api(libs.hypertrace.eventstore) + api(libs.hypertrace.attributeservice.api) + api(libs.hypertrace.attributeservice.cachingclient) + api(libs.hypertrace.gatewayservice.api) api(libs.guava) api(libs.rholder.guava.retrying) @@ -26,10 +29,13 @@ dependencies { api(libs.protobuf.java) api(libs.protobuf.javautil) api(libs.jackson.databind) + api(libs.jackson.datatype.jdk8) + api(libs.jackson.datatype.jsr310) api(libs.grpc.core) api(libs.grpc.stub) api(libs.grpc.protobuf) api(libs.grpc.api) + api(libs.grpc.context) api(libs.grpc.netty) api(libs.slf4j2.api) api(libs.log4j.slf4j2.impl) @@ -37,4 +43,7 @@ dependencies { api(libs.rxjava3) api(libs.uuidcreator) api(libs.kafka.clients) + api(libs.commons.text) + api(libs.graphql.java) + api(libs.jsr305) }