From a60ac4477378cb9b4a5bc819374c99e35990ddfa Mon Sep 17 00:00:00 2001 From: Harshit Kumar Date: Mon, 9 Dec 2024 20:19:15 +0530 Subject: [PATCH] move to guice7 --- alerting-config-service-api/gradle.lockfile | 2 +- alerting-config-service-impl/gradle.lockfile | 2 +- config-object-store/gradle.lockfile | 2 +- config-proto-converter/gradle.lockfile | 2 +- config-service-api/gradle.lockfile | 2 +- config-service-change-event-api/gradle.lockfile | 2 +- config-service-change-event-generator/gradle.lockfile | 2 +- config-service-factory/gradle.lockfile | 5 ++--- config-service-impl/gradle.lockfile | 2 +- config-service/gradle.lockfile | 5 ++--- config-validation-utils/gradle.lockfile | 2 +- label-application-rule-config-service-api/gradle.lockfile | 2 +- label-application-rule-config-service-impl/gradle.lockfile | 2 +- labels-config-service-api/gradle.lockfile | 2 +- labels-config-service-impl/gradle.lockfile | 2 +- notification-channel-config-service-api/gradle.lockfile | 2 +- notification-channel-config-service-impl/gradle.lockfile | 2 +- notification-rule-config-service-api/gradle.lockfile | 2 +- notification-rule-config-service-impl/gradle.lockfile | 2 +- partitioner-config-service-api/gradle.lockfile | 2 +- partitioner-config-service-impl/build.gradle.kts | 2 +- partitioner-config-service-impl/gradle.lockfile | 5 ++--- .../config/service/PartitionerConfigServiceImpl.java | 2 +- settings-gradle.lockfile | 5 +++++ spaces-config-service-api/gradle.lockfile | 2 +- spaces-config-service-impl/gradle.lockfile | 2 +- span-processing-config-service-api/gradle.lockfile | 2 +- span-processing-config-service-impl/build.gradle.kts | 2 +- span-processing-config-service-impl/gradle.lockfile | 5 ++--- .../config/service/store/ExcludeSpanRulesConfigStore.java | 2 +- span-processing-utils/gradle.lockfile | 2 +- 31 files changed, 39 insertions(+), 38 deletions(-) create mode 100644 settings-gradle.lockfile diff --git a/alerting-config-service-api/gradle.lockfile b/alerting-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/alerting-config-service-api/gradle.lockfile +++ b/alerting-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/alerting-config-service-impl/gradle.lockfile b/alerting-config-service-impl/gradle.lockfile index 0ec2af60..1b917092 100644 --- a/alerting-config-service-impl/gradle.lockfile +++ b/alerting-config-service-impl/gradle.lockfile @@ -42,7 +42,7 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/config-object-store/gradle.lockfile b/config-object-store/gradle.lockfile index 1dc09469..f84fd701 100644 --- a/config-object-store/gradle.lockfile +++ b/config-object-store/gradle.lockfile @@ -38,7 +38,7 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,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 diff --git a/config-proto-converter/gradle.lockfile b/config-proto-converter/gradle.lockfile index 201c7330..356c6a13 100644 --- a/config-proto-converter/gradle.lockfile +++ b/config-proto-converter/gradle.lockfile @@ -21,6 +21,6 @@ io.grpc:grpc-protobuf-lite:1.68.1=runtimeClasspath,testRuntimeClasspath io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/config-service-api/gradle.lockfile b/config-service-api/gradle.lockfile index 7615513d..1bbbb555 100644 --- a/config-service-api/gradle.lockfile +++ b/config-service-api/gradle.lockfile @@ -31,7 +31,7 @@ net.bytebuddy:byte-buddy-agent:1.14.10=testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.10=testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.8.0=testRuntimeClasspath diff --git a/config-service-change-event-api/gradle.lockfile b/config-service-change-event-api/gradle.lockfile index 19602cf0..e9f176c2 100644 --- a/config-service-change-event-api/gradle.lockfile +++ b/config-service-change-event-api/gradle.lockfile @@ -6,7 +6,7 @@ com.github.luben:zstd-jni:1.5.6-3=runtimeClasspath,testRuntimeClasspath com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.grpc:grpc-bom:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath diff --git a/config-service-change-event-generator/gradle.lockfile b/config-service-change-event-generator/gradle.lockfile index 3b4ffc1d..10410e50 100644 --- a/config-service-change-event-generator/gradle.lockfile +++ b/config-service-change-event-generator/gradle.lockfile @@ -41,7 +41,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=compileClasspath,runtimeClasspath,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 diff --git a/config-service-factory/gradle.lockfile b/config-service-factory/gradle.lockfile index 19f05399..bae64a10 100644 --- a/config-service-factory/gradle.lockfile +++ b/config-service-factory/gradle.lockfile @@ -20,7 +20,7 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.1-android=compileClasspath,testCompileClasspath com.google.guava:guava:33.2.1-jre=runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.inject:guice:6.0.0=runtimeClasspath,testRuntimeClasspath +com.google.inject:guice:7.0.0=runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath com.google.protobuf:protobuf-java-util:3.25.5=runtimeClasspath,testRuntimeClasspath @@ -77,7 +77,6 @@ io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntime io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.inject:javax.inject:1=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath,testRuntimeClasspath net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath @@ -98,7 +97,7 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.7=runtimeClasspath,testRuntimeClasspath diff --git a/config-service-impl/gradle.lockfile b/config-service-impl/gradle.lockfile index 66a9d305..5e88e1dd 100644 --- a/config-service-impl/gradle.lockfile +++ b/config-service-impl/gradle.lockfile @@ -72,7 +72,7 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=testCompileClasspath,testRuntimeClasspath diff --git a/config-service/gradle.lockfile b/config-service/gradle.lockfile index 24f88ffa..815ed2fa 100644 --- a/config-service/gradle.lockfile +++ b/config-service/gradle.lockfile @@ -20,7 +20,7 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.1-android=compileClasspath,testCompileClasspath com.google.guava:guava:33.2.1-jre=runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.inject:guice:6.0.0=runtimeClasspath,testRuntimeClasspath +com.google.inject:guice:7.0.0=runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath com.google.protobuf:protobuf-java-util:3.25.5=runtimeClasspath,testRuntimeClasspath @@ -77,7 +77,6 @@ io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntime io.reactivex.rxjava3:rxjava:3.1.7=runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=runtimeClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=runtimeClasspath,testRuntimeClasspath -javax.inject:javax.inject:1=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath,testRuntimeClasspath net.jodah:failsafe:2.4.4=runtimeClasspath,testRuntimeClasspath @@ -101,7 +100,7 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.5=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.7=runtimeClasspath,testRuntimeClasspath diff --git a/config-validation-utils/gradle.lockfile b/config-validation-utils/gradle.lockfile index 4b92d217..2b310337 100644 --- a/config-validation-utils/gradle.lockfile +++ b/config-validation-utils/gradle.lockfile @@ -31,7 +31,7 @@ io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath org.checkerframework:checker-qual:3.42.0=runtimeClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,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.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath diff --git a/label-application-rule-config-service-api/gradle.lockfile b/label-application-rule-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/label-application-rule-config-service-api/gradle.lockfile +++ b/label-application-rule-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/label-application-rule-config-service-impl/gradle.lockfile b/label-application-rule-config-service-impl/gradle.lockfile index f6d1d636..2cf98203 100644 --- a/label-application-rule-config-service-impl/gradle.lockfile +++ b/label-application-rule-config-service-impl/gradle.lockfile @@ -42,7 +42,7 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/labels-config-service-api/gradle.lockfile b/labels-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/labels-config-service-api/gradle.lockfile +++ b/labels-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/labels-config-service-impl/gradle.lockfile b/labels-config-service-impl/gradle.lockfile index 43bea350..a49ed722 100644 --- a/labels-config-service-impl/gradle.lockfile +++ b/labels-config-service-impl/gradle.lockfile @@ -42,7 +42,7 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/notification-channel-config-service-api/gradle.lockfile b/notification-channel-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/notification-channel-config-service-api/gradle.lockfile +++ b/notification-channel-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/notification-channel-config-service-impl/gradle.lockfile b/notification-channel-config-service-impl/gradle.lockfile index 69301207..9d76c31d 100644 --- a/notification-channel-config-service-impl/gradle.lockfile +++ b/notification-channel-config-service-impl/gradle.lockfile @@ -42,7 +42,7 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/notification-rule-config-service-api/gradle.lockfile b/notification-rule-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/notification-rule-config-service-api/gradle.lockfile +++ b/notification-rule-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/notification-rule-config-service-impl/gradle.lockfile b/notification-rule-config-service-impl/gradle.lockfile index 50591dfa..d209bc20 100644 --- a/notification-rule-config-service-impl/gradle.lockfile +++ b/notification-rule-config-service-impl/gradle.lockfile @@ -41,7 +41,7 @@ org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testC org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/partitioner-config-service-api/gradle.lockfile b/partitioner-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/partitioner-config-service-api/gradle.lockfile +++ b/partitioner-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/partitioner-config-service-impl/build.gradle.kts b/partitioner-config-service-impl/build.gradle.kts index a2c7b911..9c39ac9b 100644 --- a/partitioner-config-service-impl/build.gradle.kts +++ b/partitioner-config-service-impl/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { api(projects.partitionerConfigServiceApi) implementation(commonLibs.protobuf.javautil) - implementation(commonLibs.guice) + implementation(commonLibs.guice7) implementation(commonLibs.slf4j2.api) implementation(commonLibs.typesafe.config) implementation(commonLibs.hypertrace.documentstore) diff --git a/partitioner-config-service-impl/gradle.lockfile b/partitioner-config-service-impl/gradle.lockfile index 9b448535..31acbb6a 100644 --- a/partitioner-config-service-impl/gradle.lockfile +++ b/partitioner-config-service-impl/gradle.lockfile @@ -18,7 +18,7 @@ com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:33.2.1-android=compileClasspath,testCompileClasspath com.google.guava:guava:33.2.1-jre=runtimeClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.inject:guice:7.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -72,7 +72,6 @@ io.prometheus:simpleclient_tracer_otel:0.16.0=runtimeClasspath,testRuntimeClassp io.prometheus:simpleclient_tracer_otel_agent:0.16.0=runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=runtimeClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.3.0=runtimeClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath @@ -95,7 +94,7 @@ org.eclipse.jetty:jetty-servlet:9.4.56.v20240826=runtimeClasspath,testRuntimeCla org.eclipse.jetty:jetty-util-ajax:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.56.v20240826=runtimeClasspath,testRuntimeClasspath org.hdrhistogram:HdrHistogram:2.1.12=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.documentstore:document-store:0.8.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=runtimeClasspath,testRuntimeClasspath diff --git a/partitioner-config-service-impl/src/main/java/org/hypertrace/partitioner/config/service/PartitionerConfigServiceImpl.java b/partitioner-config-service-impl/src/main/java/org/hypertrace/partitioner/config/service/PartitionerConfigServiceImpl.java index 3ae6d424..02536389 100644 --- a/partitioner-config-service-impl/src/main/java/org/hypertrace/partitioner/config/service/PartitionerConfigServiceImpl.java +++ b/partitioner-config-service-impl/src/main/java/org/hypertrace/partitioner/config/service/PartitionerConfigServiceImpl.java @@ -1,8 +1,8 @@ package org.hypertrace.partitioner.config.service; -import com.google.inject.Inject; import io.grpc.Status; import io.grpc.stub.StreamObserver; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile new file mode 100644 index 00000000..63af6091 --- /dev/null +++ b/settings-gradle.lockfile @@ -0,0 +1,5 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +org.hypertrace.bom:hypertrace-version-catalog:0.3.33=incomingCatalogForCommonLibs0 +empty=incomingCatalogForLocalLibs0 diff --git a/spaces-config-service-api/gradle.lockfile b/spaces-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/spaces-config-service-api/gradle.lockfile +++ b/spaces-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/spaces-config-service-impl/gradle.lockfile b/spaces-config-service-impl/gradle.lockfile index cff2c10c..138c6e47 100644 --- a/spaces-config-service-impl/gradle.lockfile +++ b/spaces-config-service-impl/gradle.lockfile @@ -36,7 +36,7 @@ net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/span-processing-config-service-api/gradle.lockfile b/span-processing-config-service-api/gradle.lockfile index 8d3b8375..a683570c 100644 --- a/span-processing-config-service-api/gradle.lockfile +++ b/span-processing-config-service-api/gradle.lockfile @@ -17,6 +17,6 @@ io.grpc:grpc-protobuf:1.68.1=compileClasspath,runtimeClasspath,testCompileClassp io.grpc:grpc-stub:1.68.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor diff --git a/span-processing-config-service-impl/build.gradle.kts b/span-processing-config-service-impl/build.gradle.kts index 55a4fe60..69151f31 100644 --- a/span-processing-config-service-impl/build.gradle.kts +++ b/span-processing-config-service-impl/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { implementation(commonLibs.hypertrace.grpcutils.context) implementation(commonLibs.hypertrace.grpcutils.client) - implementation(commonLibs.guice) + implementation(commonLibs.guice7) implementation(commonLibs.guava) implementation(commonLibs.slf4j2.api) implementation(commonLibs.typesafe.config) diff --git a/span-processing-config-service-impl/gradle.lockfile b/span-processing-config-service-impl/gradle.lockfile index f8717b3e..f3e36513 100644 --- a/span-processing-config-service-impl/gradle.lockfile +++ b/span-processing-config-service-impl/gradle.lockfile @@ -19,7 +19,7 @@ com.google.errorprone:error_prone_annotations:2.28.0=compileClasspath,runtimeCla com.google.guava:failureaccess:1.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:33.2.1-android=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.inject:guice:6.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.inject:guice:7.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=runtimeClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,testCompileClasspath com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -39,14 +39,13 @@ io.netty:netty-bom:4.1.115.Final=compileClasspath,runtimeClasspath,testCompileCl io.perfmark:perfmark-api:0.27.0=runtimeClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.inject:javax.inject:1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.14.10=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath org.apache.kafka:kafka-clients:7.7.0-ccs=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.eventstore:event-store:0.1.4=runtimeClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/span-processing-config-service-impl/src/main/java/org/hypertrace/span/processing/config/service/store/ExcludeSpanRulesConfigStore.java b/span-processing-config-service-impl/src/main/java/org/hypertrace/span/processing/config/service/store/ExcludeSpanRulesConfigStore.java index e48c59ba..1c34e485 100644 --- a/span-processing-config-service-impl/src/main/java/org/hypertrace/span/processing/config/service/store/ExcludeSpanRulesConfigStore.java +++ b/span-processing-config-service-impl/src/main/java/org/hypertrace/span/processing/config/service/store/ExcludeSpanRulesConfigStore.java @@ -1,7 +1,7 @@ package org.hypertrace.span.processing.config.service.store; -import com.google.inject.Inject; import com.google.protobuf.Value; +import jakarta.inject.Inject; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; diff --git a/span-processing-utils/gradle.lockfile b/span-processing-utils/gradle.lockfile index 820131e8..e143a205 100644 --- a/span-processing-utils/gradle.lockfile +++ b/span-processing-utils/gradle.lockfile @@ -33,7 +33,7 @@ net.bytebuddy:byte-buddy:1.14.10=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.42.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.24=testRuntimeClasspath -org.hypertrace.bom:hypertrace-bom:0.3.39=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hypertrace.bom:hypertrace-bom:0.3.40=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7=testRuntimeClasspath org.hypertrace.core.kafkastreams.framework:kafka-bom:0.5.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath