From 12e30274f35fc5265ac3d6937d24c39c06140851 Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 21 Oct 2022 13:19:36 +0530 Subject: [PATCH 1/3] chore: gradle catalog dependencies --- .../build.gradle.kts | 6 +- .../build.gradle.kts | 8 +- attribute-service-api/build.gradle.kts | 10 +-- attribute-service-client/build.gradle.kts | 6 +- attribute-service-factory/build.gradle.kts | 6 +- attribute-service-impl/build.gradle.kts | 24 ++--- attribute-service-tenant-api/build.gradle.kts | 2 +- attribute-service/build.gradle.kts | 16 ++-- .../build.gradle.kts | 31 ++++--- gradle/libs.versions.toml | 90 +++++++++++++++++++ settings.gradle.kts | 3 + 11 files changed, 145 insertions(+), 57 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/attribute-projection-functions/build.gradle.kts b/attribute-projection-functions/build.gradle.kts index a76a09e1..1a6713e6 100644 --- a/attribute-projection-functions/build.gradle.kts +++ b/attribute-projection-functions/build.gradle.kts @@ -6,10 +6,10 @@ plugins { } dependencies { - api("com.google.code.findbugs:jsr305:3.0.2") - implementation("com.github.f4b6a3:uuid-creator:5.1.0") + api(libs.findbugs.jsr) + implementation(libs.uuid.creator) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") + testImplementation(libs.junit.jupiter) } tasks.test { diff --git a/attribute-projection-registry/build.gradle.kts b/attribute-projection-registry/build.gradle.kts index 69164abe..5b6aae52 100644 --- a/attribute-projection-registry/build.gradle.kts +++ b/attribute-projection-registry/build.gradle.kts @@ -6,10 +6,10 @@ plugins { } dependencies { - api(project(":attribute-service-api")) - implementation(project(":attribute-projection-functions")) - implementation("com.google.guava:guava:31.1-jre") - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") + api(projects.attributeServiceApi) + implementation(projects.attributeProjectionFunctions) + implementation(libs.google.guava) + testImplementation(libs.junit.jupiter) } tasks.test { diff --git a/attribute-service-api/build.gradle.kts b/attribute-service-api/build.gradle.kts index f24aba3e..67777b09 100644 --- a/attribute-service-api/build.gradle.kts +++ b/attribute-service-api/build.gradle.kts @@ -15,11 +15,11 @@ val generateLocalGoGrpcFiles = false protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.15.6" + artifact = "com.google.protobuf:protoc:${libs.versions.protoc.get()}" } plugins { id("grpc_java") { - artifact = "io.grpc:protoc-gen-grpc-java:1.44.0" + artifact = "io.grpc:protoc-gen-grpc-java:${libs.versions.grpc.get()}" } if (generateLocalGoGrpcFiles) { @@ -57,9 +57,5 @@ sourceSets { } dependencies { - api(platform("io.grpc:grpc-bom:1.44.0")) - api("io.grpc:grpc-stub") - api("io.grpc:grpc-protobuf") - - implementation("javax.annotation:javax.annotation-api:1.3.2") + api(libs.bundles.grpc.api) } diff --git a/attribute-service-client/build.gradle.kts b/attribute-service-client/build.gradle.kts index 014d45eb..4ef0a2d1 100644 --- a/attribute-service-client/build.gradle.kts +++ b/attribute-service-client/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - api(project(":attribute-service-api")) - api("com.typesafe:config:1.4.1") + api(projects.attributeServiceApi) + api(libs.typesafe.config) - implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.7.2") + implementation(libs.hypertrace.grpc.client.utils) } diff --git a/attribute-service-factory/build.gradle.kts b/attribute-service-factory/build.gradle.kts index 39a33df1..b2f09cac 100644 --- a/attribute-service-factory/build.gradle.kts +++ b/attribute-service-factory/build.gradle.kts @@ -3,10 +3,10 @@ plugins { } dependencies { - api("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.37") + api(libs.hypertrace.serviceFramework.grpcFramework) // Only required because AttributeService constructor test overload uses a doc store API - compileOnly("org.hypertrace.core.documentstore:document-store:0.7.17") + compileOnly(libs.hypertrace.document.store) - implementation(project(":attribute-service-impl")) + implementation(projects.attributeServiceImpl) } diff --git a/attribute-service-impl/build.gradle.kts b/attribute-service-impl/build.gradle.kts index c51299c4..0a0b8a2f 100644 --- a/attribute-service-impl/build.gradle.kts +++ b/attribute-service-impl/build.gradle.kts @@ -5,21 +5,21 @@ plugins { } dependencies { - api(project(":attribute-service-api")) - implementation(project(":attribute-service-tenant-api")) + api(projects.attributeServiceApi) + implementation(projects.attributeServiceTenantApi) - implementation("org.hypertrace.core.documentstore:document-store:0.7.17") - implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.7.2") + implementation(libs.hypertrace.document.store) + implementation(libs.hypertrace.grpc.context.utils) - implementation("com.fasterxml.jackson.core:jackson-databind:2.13.2.2") - implementation("com.typesafe:config:1.4.1") - implementation("org.slf4j:slf4j-api:1.7.32") - implementation("com.google.protobuf:protobuf-java-util:3.19.2") - implementation("com.google.guava:guava:31.1-jre") + implementation(libs.jackson.databind) + implementation(libs.typesafe.config) + implementation(libs.slf4j.api) + implementation(libs.protobuf.java.util) + implementation(libs.google.guava) - testImplementation("org.mockito:mockito-core:4.2.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1") + testImplementation(libs.junit.jupiter) + testImplementation(libs.bundles.mockito) + testImplementation(libs.apache.log4j.slf4jImpl) } tasks.test { diff --git a/attribute-service-tenant-api/build.gradle.kts b/attribute-service-tenant-api/build.gradle.kts index 46a5f1a9..25764e9f 100644 --- a/attribute-service-tenant-api/build.gradle.kts +++ b/attribute-service-tenant-api/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") + testImplementation(libs.junit.jupiter) } tasks.test { diff --git a/attribute-service/build.gradle.kts b/attribute-service/build.gradle.kts index c236cd70..6f62b2b0 100644 --- a/attribute-service/build.gradle.kts +++ b/attribute-service/build.gradle.kts @@ -54,16 +54,16 @@ tasks.integrationTest { } dependencies { - implementation(project(":attribute-service-factory")) - implementation("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.37") - runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1") - runtimeOnly("io.grpc:grpc-netty") + implementation(projects.attributeServiceFactory) + implementation(libs.hypertrace.serviceFramework.grpcFramework) + runtimeOnly(libs.apache.log4j.slf4jImpl) + runtimeOnly(libs.grpc.netty) // Integration test dependencies - integrationTestImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - integrationTestImplementation("com.google.guava:guava:31.1-jre") - integrationTestImplementation(project(":attribute-service-client")) - integrationTestImplementation("org.hypertrace.core.serviceframework:integrationtest-service-framework:0.1.37") + integrationTestImplementation(projects.attributeServiceClient) + integrationTestImplementation(libs.junit.jupiter) + integrationTestImplementation(libs.google.guava) + integrationTestImplementation(libs.hypertrace.serviceFramework.integrationTestFramework) } application { diff --git a/caching-attribute-service-client/build.gradle.kts b/caching-attribute-service-client/build.gradle.kts index 75142b8b..40b8211d 100644 --- a/caching-attribute-service-client/build.gradle.kts +++ b/caching-attribute-service-client/build.gradle.kts @@ -6,24 +6,23 @@ plugins { } dependencies { - api(project(":attribute-service-api")) - api("io.reactivex.rxjava3:rxjava:3.1.3") - api("io.grpc:grpc-api") + api(projects.attributeServiceApi) + api(libs.rxjava) + api(libs.grpc.api) - implementation("io.grpc:grpc-stub") - implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.7.2") - implementation("org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.7.2") - implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.7.2") - implementation("com.google.guava:guava:31.1-jre") - annotationProcessor("org.projectlombok:lombok:1.18.22") - compileOnly("org.projectlombok:lombok:1.18.22") - implementation("org.slf4j:slf4j-api:1.7.32") + implementation(libs.grpc.stub) + implementation(libs.hypertrace.grpc.client.utils) + implementation(libs.hypertrace.grpc.client.rx.utils) + implementation(libs.hypertrace.grpc.context.utils) + implementation(libs.google.guava) + annotationProcessor(libs.lombok) + compileOnly(libs.lombok) + implementation(libs.slf4j.api) - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") - testImplementation("org.mockito:mockito-core:4.2.0") - testImplementation("org.mockito:mockito-junit-jupiter:4.2.0") - testImplementation("io.grpc:grpc-core") - testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.17.1") + testImplementation(libs.junit.jupiter) + testImplementation(libs.bundles.mockito) + testImplementation(libs.grpc.core) + testImplementation(libs.apache.log4j.slf4jImpl) } tasks.test { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..66692bba --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,90 @@ +[versions] +hypertrace-grpcUtils = "0.7.6" +hypertrace-serviceFramework = "0.1.41" +hypertrace-ingester = "0.7.6" +hypertrace-entityService = "0.8.38" +hypertrace-kafkaStreams = "0.2.0" +hypertrace-dataModel = "0.1.22" + +traceable-modsecurity = "0.1.99" +traceable-platformGateway = "0.6.44" +traceable-traceEnricher = "0.18.56" +traceable-licenseMeteringService = "0.1.40" +traceable-config-service = "0.24.77" +traceable-job-service = "0.1.105" +traceable-insights-service = "0.49.27" + +grpc = "1.48.0" +netty = "4.1.79.Final" +platform-metrics = "0.1.41" +confluent-kafka = "7.2.1-ccs" +confluent-platform = "7.2.1" + +[libraries] +hypertrace-kafkaStreams-framework = { module = "org.hypertrace.core.kafkastreams.framework:kafka-streams-framework", version.ref = "hypertrace-kafkaStreams" } +hypertrace-entityService-api = { module = "org.hypertrace.entity.service:entity-service-api", version.ref = "hypertrace-entityService" } +hypertrace-entityService-client = { module = "org.hypertrace.entity.service:entity-service-client", version.ref = "hypertrace-entityService"} +hypertrace-entity-change-event-api = { module = "org.hypertrace.entity.service:entity-service-change-event-api", version.ref = "hypertrace-entityService" } +hypertrace-spanNormalizer-rawSpanConstants = { module = "org.hypertrace.core.spannormalizer:raw-span-constants", version.ref = "hypertrace-ingester" } +hypertrace-traceEnricher-enrichedSpanConstants = { module = "org.hypertrace.traceenricher:enriched-span-constants", version.ref = "hypertrace-ingester" } +hypertrace-serviceFramework-metrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "hypertrace-serviceFramework" } +hypertrace-platformMetrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "platform-metrics" } +hypertrace-serviceFramework-framework = { module = "org.hypertrace.core.serviceframework:platform-service-framework", version.ref = "hypertrace-serviceFramework" } +hypertrace-dataModel = { module = "org.hypertrace.core.datamodel:data-model", version.ref = "hypertrace-dataModel"} +hypertrace-grpc-client-utils = { module = "org.hypertrace.core.grpcutils:grpc-client-utils", version.ref = "hypertrace-grpcUtils"} +hypertrace-grpc-context-utils = { module = "org.hypertrace.core.grpcutils:grpc-context-utils", version.ref = "hypertrace-grpcUtils"} + +traceable-insights-service-api = { module = "ai.traceable.platform:insights-service-api", version.ref = "traceable-insights-service" } +traceable-insights-service-constants = { module = "ai.traceable.platform:insights-service-constants", version.ref = "traceable-insights-service" } +traceable-platform-entityMigratingClient = { module = "ai.traceable.platform:entity-migrating-client", version = "0.10.5"} +traceable-platformGateway-dataModel = { module = "ai.traceable.platform-gateway:data-model", version.ref = "traceable-platformGateway" } +traceable-platformGateway-trainingEvaluationFramework = { module = "ai.traceable.platform-gateway:training-evaluation-framework", version.ref = "traceable-platformGateway" } +traceable-platformGateway-apiUtils = { module = "ai.traceable.platform-gateway:api-utils", version.ref = "traceable-platformGateway" } +traceable-platformGateway-graphqlApiUtils = { module = "ai.traceable.platform-gateway:graphql-api-utils", version.ref = "traceable-platformGateway" } +traceable-platformGateway-toolsApi = { module = "ai.traceable.platform-gateway:tools-api", version.ref = "traceable-platformGateway" } +traceable-platformGateway-deepDataStore = { module = "ai.traceable.platform-gateway:deep-data-store", version.ref = "traceable-platformGateway" } +traceable-platformGateway-fileDataLoaders = { module = "ai.traceable.platform-gateway:file-data-loaders", version.ref = "traceable-platformGateway" } +traceable-platformGateway-cacheProvider = { module = "ai.traceable.platform-gateway:cache-provider", version.ref = "traceable-platformGateway" } +traceable-platform-traceEnricherConstants = { module = "ai.traceable.platform:trace-enricher-constants", version.ref = "traceable-traceEnricher" } +traceable-platform-traceEnricherApi = { module = "ai.traceable.platform:trace-enricher-api", version.ref = "traceable-traceEnricher" } +traceable-config-service-anomalyConfigServiceApi = { module = "ai.traceable.config.service:anomaly-config-service-api", version.ref="traceable-config-service"} +traceable-config-service-rateLimitConfigServiceApi = { module = "ai.traceable.config.service:rate-limiting-config-service-api", version.ref="traceable-config-service"} +traceable-config-service-apiAttributeOverrideService = { module = "ai.traceable.config.service:api-attribute-override-service-api", version.ref = "traceable-config-service"} +traceable-config-service-spanProcessingConfigServiceApi = { module = "ai.traceable.config.service:traceable-span-processing-config-service-api", version.ref = "traceable-config-service"} +traceable-config-service-configUtils = { module = "ai.traceable.config.service:config-utils", version.ref = "traceable-config-service"} +traceable-config-providers = { module = "ai.traceable.platform:config-providers", version = "0.7.82" } +traceable-license-metering-service = { module = "ai.traceable.license.metering.service:license-metering-service-api", version.ref = "traceable-licenseMeteringService"} +traceable-job-service-api = { module = "ai.traceable.job.service:job-service-api", version.ref = "traceable-job-service" } +traceable-platform-jniModsecurity = { module = "ai.traceable.platform:jni-modsecurity", version.ref = "traceable-modsecurity" } + +kafka-protobufserde = { module = "io.confluent:kafka-streams-protobuf-serde", version.ref = "confluent-platform" } +kafka-avroserializer = { module = "io.confluent:kafka-avro-serializer", version.ref = "confluent-platform" } +github-uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version = "4.0.1" } +github-retryer = { module = "com.github.rholder:guava-retrying", version = "2.0.0"} +github-stefanbirkner-systemRules = { module = "com.github.stefanbirkner:system-rules", version = "1.19.0" } +google-code-findbugs = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } +google-guava = { module = "com.google.guava:guava", version = "31.1-jre" } +google-inject-guice = { module = "com.google.inject:guice", version = "5.0.1" } +typesafe-config = { module = "com.typesafe:config", version = "1.4.2" } +apache-avro = { module = "org.apache.avro:avro", version = "1.11.1" } +apache-commons-lang = { module = "org.apache.commons:commons-lang3", version = "3.11" } +apache-log4j-slf4jImpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.17.1" } +apache-spark-core = { module = "org.apache.spark:spark-core_2.13", version = "3.3.0" } +apache-spark-sql = { module = "org.apache.spark:spark-sql_2.13", version = "3.3.0" } +slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.30" } +commons-cli = { module = "commons-cli:commons-cli", version = "1.4" } +commons-io = { module = "commons-io:commons-io", version = "2.8.0" } +grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" } +netty-codecHttp2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" } +netty-handlerProxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" } +netty-handler = {module = "io.netty:netty-handler", version.ref = "netty"} +lombok = { module = "org.projectlombok:lombok", version = "1.18.18" } + +junit-junit = { module = "junit:junit", version = "4.13.1" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.7.2" } +mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "4.7.0" } +mockito-core = { module = "org.mockito:mockito-core", version = "4.7.0" } +mockito-inline = { module = "org.mockito:mockito-inline", version = "4.7.0" } +graphql-java = { module = "com.graphql-java:graphql-java", version = "19.2" } +graphql-javaKickstart = { module = "com.graphql-java-kickstart:graphql-java-kickstart", version = "11.0.0" } +apache-kafka-kafkaStreamsTestUtils = { module = "org.apache.kafka:kafka-streams-test-utils", version.ref = "confluent-kafka" } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index f3ebec90..a9946b02 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,6 +12,9 @@ plugins { id("org.hypertrace.version-settings") version "0.2.0" } +enableFeaturePreview("VERSION_CATALOGS") +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + include(":attribute-service-api") include(":attribute-service-client") include(":attribute-service-impl") From 36bd289e4ae831eb66fdc45764a43dc314ffdbd1 Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 21 Oct 2022 13:23:24 +0530 Subject: [PATCH 2/3] fix toml --- gradle/libs.versions.toml | 108 +++++++++++--------------------------- 1 file changed, 31 insertions(+), 77 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 66692bba..f32fd4c3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,90 +1,44 @@ [versions] -hypertrace-grpcUtils = "0.7.6" -hypertrace-serviceFramework = "0.1.41" -hypertrace-ingester = "0.7.6" -hypertrace-entityService = "0.8.38" -hypertrace-kafkaStreams = "0.2.0" -hypertrace-dataModel = "0.1.22" - -traceable-modsecurity = "0.1.99" -traceable-platformGateway = "0.6.44" -traceable-traceEnricher = "0.18.56" -traceable-licenseMeteringService = "0.1.40" -traceable-config-service = "0.24.77" -traceable-job-service = "0.1.105" -traceable-insights-service = "0.49.27" +hypertrace-serviceFramework = "0.1.43" +hypertrace-grpcUtils = "0.9.0" +hypertrace-documentStore = "0.7.18" +protoc = "3.21.8" grpc = "1.48.0" -netty = "4.1.79.Final" -platform-metrics = "0.1.41" -confluent-kafka = "7.2.1-ccs" -confluent-platform = "7.2.1" +mockito = "4.8.1" +jackson = "2.13.4.2" [libraries] -hypertrace-kafkaStreams-framework = { module = "org.hypertrace.core.kafkastreams.framework:kafka-streams-framework", version.ref = "hypertrace-kafkaStreams" } -hypertrace-entityService-api = { module = "org.hypertrace.entity.service:entity-service-api", version.ref = "hypertrace-entityService" } -hypertrace-entityService-client = { module = "org.hypertrace.entity.service:entity-service-client", version.ref = "hypertrace-entityService"} -hypertrace-entity-change-event-api = { module = "org.hypertrace.entity.service:entity-service-change-event-api", version.ref = "hypertrace-entityService" } -hypertrace-spanNormalizer-rawSpanConstants = { module = "org.hypertrace.core.spannormalizer:raw-span-constants", version.ref = "hypertrace-ingester" } -hypertrace-traceEnricher-enrichedSpanConstants = { module = "org.hypertrace.traceenricher:enriched-span-constants", version.ref = "hypertrace-ingester" } -hypertrace-serviceFramework-metrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "hypertrace-serviceFramework" } -hypertrace-platformMetrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "platform-metrics" } -hypertrace-serviceFramework-framework = { module = "org.hypertrace.core.serviceframework:platform-service-framework", version.ref = "hypertrace-serviceFramework" } -hypertrace-dataModel = { module = "org.hypertrace.core.datamodel:data-model", version.ref = "hypertrace-dataModel"} +hypertrace-serviceFramework-grpcFramework = { module = "org.hypertrace.core.serviceframework:platform-grpc-service-framework", version.ref = "hypertrace-serviceFramework" } +hypertrace-serviceFramework-integrationTestFramework = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-serviceFramework" } hypertrace-grpc-client-utils = { module = "org.hypertrace.core.grpcutils:grpc-client-utils", version.ref = "hypertrace-grpcUtils"} +hypertrace-grpc-client-rx-utils = { module = "org.hypertrace.core.grpcutils:grpc-client-rx-utils", version.ref = "hypertrace-grpcUtils"} hypertrace-grpc-context-utils = { module = "org.hypertrace.core.grpcutils:grpc-context-utils", version.ref = "hypertrace-grpcUtils"} +hypertrace-document-store = { module = "org.hypertrace.core.documentstore:document-store", version.ref = "hypertrace-documentStore" } + +grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" } +grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" } +grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" } +grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" } +grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" } -traceable-insights-service-api = { module = "ai.traceable.platform:insights-service-api", version.ref = "traceable-insights-service" } -traceable-insights-service-constants = { module = "ai.traceable.platform:insights-service-constants", version.ref = "traceable-insights-service" } -traceable-platform-entityMigratingClient = { module = "ai.traceable.platform:entity-migrating-client", version = "0.10.5"} -traceable-platformGateway-dataModel = { module = "ai.traceable.platform-gateway:data-model", version.ref = "traceable-platformGateway" } -traceable-platformGateway-trainingEvaluationFramework = { module = "ai.traceable.platform-gateway:training-evaluation-framework", version.ref = "traceable-platformGateway" } -traceable-platformGateway-apiUtils = { module = "ai.traceable.platform-gateway:api-utils", version.ref = "traceable-platformGateway" } -traceable-platformGateway-graphqlApiUtils = { module = "ai.traceable.platform-gateway:graphql-api-utils", version.ref = "traceable-platformGateway" } -traceable-platformGateway-toolsApi = { module = "ai.traceable.platform-gateway:tools-api", version.ref = "traceable-platformGateway" } -traceable-platformGateway-deepDataStore = { module = "ai.traceable.platform-gateway:deep-data-store", version.ref = "traceable-platformGateway" } -traceable-platformGateway-fileDataLoaders = { module = "ai.traceable.platform-gateway:file-data-loaders", version.ref = "traceable-platformGateway" } -traceable-platformGateway-cacheProvider = { module = "ai.traceable.platform-gateway:cache-provider", version.ref = "traceable-platformGateway" } -traceable-platform-traceEnricherConstants = { module = "ai.traceable.platform:trace-enricher-constants", version.ref = "traceable-traceEnricher" } -traceable-platform-traceEnricherApi = { module = "ai.traceable.platform:trace-enricher-api", version.ref = "traceable-traceEnricher" } -traceable-config-service-anomalyConfigServiceApi = { module = "ai.traceable.config.service:anomaly-config-service-api", version.ref="traceable-config-service"} -traceable-config-service-rateLimitConfigServiceApi = { module = "ai.traceable.config.service:rate-limiting-config-service-api", version.ref="traceable-config-service"} -traceable-config-service-apiAttributeOverrideService = { module = "ai.traceable.config.service:api-attribute-override-service-api", version.ref = "traceable-config-service"} -traceable-config-service-spanProcessingConfigServiceApi = { module = "ai.traceable.config.service:traceable-span-processing-config-service-api", version.ref = "traceable-config-service"} -traceable-config-service-configUtils = { module = "ai.traceable.config.service:config-utils", version.ref = "traceable-config-service"} -traceable-config-providers = { module = "ai.traceable.platform:config-providers", version = "0.7.82" } -traceable-license-metering-service = { module = "ai.traceable.license.metering.service:license-metering-service-api", version.ref = "traceable-licenseMeteringService"} -traceable-job-service-api = { module = "ai.traceable.job.service:job-service-api", version.ref = "traceable-job-service" } -traceable-platform-jniModsecurity = { module = "ai.traceable.platform:jni-modsecurity", version.ref = "traceable-modsecurity" } +protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" } -kafka-protobufserde = { module = "io.confluent:kafka-streams-protobuf-serde", version.ref = "confluent-platform" } -kafka-avroserializer = { module = "io.confluent:kafka-avro-serializer", version.ref = "confluent-platform" } -github-uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version = "4.0.1" } -github-retryer = { module = "com.github.rholder:guava-retrying", version = "2.0.0"} -github-stefanbirkner-systemRules = { module = "com.github.stefanbirkner:system-rules", version = "1.19.0" } -google-code-findbugs = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } +jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } +rxjava = { module = "io.reactivex.rxjava3:rxjava", version = "3.1.3" } +javax-annotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" } google-guava = { module = "com.google.guava:guava", version = "31.1-jre" } -google-inject-guice = { module = "com.google.inject:guice", version = "5.0.1" } +findbugs-jsr = { module = "com.google.code.findbugs:jsr305", version = "3.0.2" } +uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version = "5.1.0" } typesafe-config = { module = "com.typesafe:config", version = "1.4.2" } -apache-avro = { module = "org.apache.avro:avro", version = "1.11.1" } -apache-commons-lang = { module = "org.apache.commons:commons-lang3", version = "3.11" } +lombok = { module = "org.projectlombok:lombok", version = "1.18.22" } +slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.32" } apache-log4j-slf4jImpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.17.1" } -apache-spark-core = { module = "org.apache.spark:spark-core_2.13", version = "3.3.0" } -apache-spark-sql = { module = "org.apache.spark:spark-sql_2.13", version = "3.3.0" } -slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.30" } -commons-cli = { module = "commons-cli:commons-cli", version = "1.4" } -commons-io = { module = "commons-io:commons-io", version = "2.8.0" } -grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" } -netty-codecHttp2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" } -netty-handlerProxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" } -netty-handler = {module = "io.netty:netty-handler", version.ref = "netty"} -lombok = { module = "org.projectlombok:lombok", version = "1.18.18" } -junit-junit = { module = "junit:junit", version = "4.13.1" } -junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.7.2" } -mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "4.7.0" } -mockito-core = { module = "org.mockito:mockito-core", version = "4.7.0" } -mockito-inline = { module = "org.mockito:mockito-inline", version = "4.7.0" } -graphql-java = { module = "com.graphql-java:graphql-java", version = "19.2" } -graphql-javaKickstart = { module = "com.graphql-java-kickstart:graphql-java-kickstart", version = "11.0.0" } -apache-kafka-kafkaStreamsTestUtils = { module = "org.apache.kafka:kafka-streams-test-utils", version.ref = "confluent-kafka" } \ No newline at end of file +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.8.2" } +mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } +mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" } + +[bundles] +grpc-api = ["grpc-stub", "grpc-protobuf", "javax-annotation"] +mockito = ["mockito-core", "mockito-junit"] \ No newline at end of file From 2731306ea6da7e3ae721bf7ad59a665e67b90a41 Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 21 Oct 2022 13:29:44 +0530 Subject: [PATCH 3/3] fix protoc --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f32fd4c3..446035c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ hypertrace-serviceFramework = "0.1.43" hypertrace-grpcUtils = "0.9.0" hypertrace-documentStore = "0.7.18" -protoc = "3.21.8" +protoc = "3.21.2" grpc = "1.48.0" mockito = "4.8.1" jackson = "2.13.4.2"