move to bom

hypertrace · Dec 22, 2024 · 3f0f9a4 · 3f0f9a4
1 parent 51b8f60
commit 3f0f9a4
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 36 deletions.
diff --git a/config-service-factory/build.gradle.kts b/config-service-factory/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-  api(localLibs.hypertrace.framework.grpc)
+  api(commonLibs.hypertrace.framework.grpc.jakarta)
 
   implementation(projects.configServiceChangeEventGenerator)
   implementation(commonLibs.hypertrace.documentstore)
@@ -15,5 +15,5 @@ dependencies {
   implementation(projects.notificationRuleConfigServiceImpl)
   implementation(projects.notificationChannelConfigServiceImpl)
   implementation(projects.spanProcessingConfigServiceImpl)
-  implementation(localLibs.hypertrace.framework.documentstore.metrics)
+  implementation(commonLibs.hypertrace.framework.documentstore.metrics.jakarta)
 }
diff --git a/config-service-factory/gradle.lockfile b/config-service-factory/gradle.lockfile
@@ -106,11 +106,11 @@ org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtime
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:docstore-metrics:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:service-framework-spi:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:docstore-metrics:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-metrics:0.1.83=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-service-framework:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:service-framework-spi:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
 org.mongodb:bson-record-codec:5.2.0=runtimeClasspath,testRuntimeClasspath

diff --git a/config-service-impl/build.gradle.kts b/config-service-impl/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 
   implementation(commonLibs.hypertrace.documentstore)
   implementation(commonLibs.hypertrace.grpcutils.context)
-  implementation(localLibs.hypertrace.framework.documentstore.metrics)
+  implementation(commonLibs.hypertrace.framework.documentstore.metrics.jakarta)
 
   annotationProcessor(commonLibs.lombok)
   compileOnly(commonLibs.lombok)

diff --git a/config-service-impl/gradle.lockfile b/config-service-impl/gradle.lockfile
@@ -78,9 +78,9 @@ org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeCla
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:docstore-metrics:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:service-framework-spi:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:docstore-metrics:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-metrics:0.1.83=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:service-framework-spi:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-params:5.10.0=testCompileClasspath,testRuntimeClasspath

diff --git a/config-service/build.gradle.kts b/config-service/build.gradle.kts
@@ -55,7 +55,7 @@ tasks.integrationTest {
 }
 
 dependencies {
-  implementation(localLibs.hypertrace.framework.grpc)
+  implementation(commonLibs.hypertrace.framework.grpc.jakarta)
   implementation(projects.configServiceFactory)
 
   runtimeOnly(commonLibs.log4j.slf4j2.impl)
@@ -66,7 +66,7 @@ dependencies {
   integrationTestImplementation(projects.configProtoConverter)
   integrationTestImplementation(commonLibs.junit.jupiter)
   integrationTestImplementation(commonLibs.guava)
-  integrationTestImplementation(localLibs.hypertrace.integrationtest.framework)
+  integrationTestImplementation(commonLibs.hypertrace.integrationtest.framework.jakarta)
   integrationTestImplementation(commonLibs.hypertrace.grpcutils.client)
   integrationTestImplementation(commonLibs.hypertrace.grpcutils.context)
   integrationTestImplementation(commonLibs.hypertrace.documentstore)

diff --git a/config-service/gradle.lockfile b/config-service/gradle.lockfile
@@ -109,11 +109,11 @@ org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=runtimeClasspath,testRun
 org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:docstore-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:service-framework-spi:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:docstore-metrics:0.1.83=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-metrics:0.1.83=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-service-framework:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:service-framework-spi:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath
 org.mongodb:bson-record-codec:5.2.0=runtimeClasspath,testRuntimeClasspath

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,2 @@
-[versions]
-hypertrace-framework = "0.1.83-SNAPSHOT"
-
 [libraries]
-seancfoley-ipaddress = { module = "com.github.seancfoley:ipaddress", version = "5.3.4" }
-
-hypertrace-framework-grpc = { module = "org.hypertrace.core.serviceframework:platform-grpc-service-framework", version.ref = "hypertrace-framework" }
-hypertrace-framework-http = { module = "org.hypertrace.core.serviceframework:platform-http-service-framework", version.ref = "hypertrace-framework" }
-hypertrace-framework-metrics = { module = "org.hypertrace.core.serviceframework:platform-metrics", version.ref = "hypertrace-framework" }
-hypertrace-framework-documentstore-metrics = { module = "org.hypertrace.core.serviceframework:docstore-metrics", version.ref = "hypertrace-framework" }
-hypertrace-integrationtest-framework = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-framework" }
+seancfoley-ipaddress = { module = "com.github.seancfoley:ipaddress", version = "5.3.4" }
diff --git a/partitioner-config-service-impl/build.gradle.kts b/partitioner-config-service-impl/build.gradle.kts
@@ -12,8 +12,8 @@ dependencies {
   implementation(commonLibs.slf4j2.api)
   implementation(commonLibs.typesafe.config)
   implementation(commonLibs.hypertrace.documentstore)
-  implementation(localLibs.hypertrace.framework.grpc)
-  implementation(localLibs.hypertrace.framework.documentstore.metrics)
+  implementation(commonLibs.hypertrace.framework.grpc.jakarta)
+  implementation(commonLibs.hypertrace.framework.documentstore.metrics.jakarta)
 
   annotationProcessor(commonLibs.lombok)
   compileOnly(commonLibs.lombok)

diff --git a/partitioner-config-service-impl/gradle.lockfile b/partitioner-config-service-impl/gradle.lockfile
@@ -100,11 +100,11 @@ org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeC
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.7=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:docstore-metrics:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-metrics:0.1.83-SNAPSHOT=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:platform-service-framework:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.core.serviceframework:service-framework-spi:0.1.83-SNAPSHOT=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:docstore-metrics:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-metrics:0.1.83=runtimeClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:platform-service-framework:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.core.serviceframework:service-framework-spi:0.1.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.1=testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath

diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile
@@ -0,0 +1,5 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+org.hypertrace.bom:hypertrace-version-catalog:0.3.41=incomingCatalogForCommonLibs0
+empty=incomingCatalogForLocalLibs0
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 configure<DependencyPluginSettingExtension> {
-  catalogVersion.set("0.3.33")
+  catalogVersion.set("0.3.41")
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")