resolve grpc conflict

Signed-off-by: Adrian Cole <[email protected]>
openzipkin · Jan 24, 2024 · d4d0e64 · d4d0e64
1 parent aaf2231
commit d4d0e64
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -88,8 +88,8 @@
     <brave.groupId>io.zipkin.brave</brave.groupId>
     <brave.version>6.0.0</brave.version>
 
-    <!-- from armeria-grpc -->
-    <grpc.version>1.58.0</grpc.version>
+    <!-- from armeria-grpc or grpc-google-cloud-trace-v1 whichever is higher -->
+    <grpc.version>1.60.0</grpc.version>
     <!-- from grpc-protobuf -->
     <protobuf.version>3.24.0</protobuf.version>
     <guava.version>32.0.1-android</guava.version>