From f23e9b1c549b0a0668f433729eea846385ea822c Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Tue, 23 Jan 2024 15:40:26 -0500
Subject: [PATCH] deps: newer grpc-context to override old one (#1916)

* deps: newer grpc-context to override old one

* chore: ignoredUnusedDeclaredDependencies
---
 google-http-client/pom.xml | 15 +++++++++++++--
 pom.xml                    |  5 +++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
index 4d45affa1..ddfdf170d 100644
--- a/google-http-client/pom.xml
+++ b/google-http-client/pom.xml
@@ -21,9 +21,11 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.0</version>
           <configuration>
-            <ignoredUnusedDeclaredDependencies>io.opencensus:opencensus-impl</ignoredUnusedDeclaredDependencies>
+            <ignoredUnusedDeclaredDependencies>
+              <ignoredUnusedDeclaredDependency>io.opencensus:opencensus-impl</ignoredUnusedDeclaredDependency>
+              <ignoredUnusedDeclaredDependency>io.grpc:grpc-context</ignoredUnusedDeclaredDependency>
+            </ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>
         <plugin>
@@ -153,6 +155,15 @@
       <groupId>com.google.j2objc</groupId>
       <artifactId>j2objc-annotations</artifactId>
     </dependency>
+    <dependency>
+      <!--
+        This grpc-context is not directly used but to override
+        outdated grpc-context coming from opencensus-api
+        https://github.com/googleapis/google-api-java-client/issues/2416
+      -->
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-context</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-api</artifactId>
diff --git a/pom.xml b/pom.xml
index c7c2f5c53..1e4b733be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,6 +238,11 @@
         <artifactId>j2objc-annotations</artifactId>
         <version>2.8</version>
       </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-context</artifactId>
+        <version>1.60.1</version>
+      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>