From d4d0e64be88b2694641c328cc15659820aad25bb Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@tetrate.io>
Date: Wed, 24 Jan 2024 13:20:42 +0800
Subject: [PATCH] resolve grpc conflict

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 38eca0b..c9d6e69 100644
--- 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>