Skip to content

Commit f23e9b1

Browse files
authored
deps: newer grpc-context to override old one (#1916)
* deps: newer grpc-context to override old one * chore: ignoredUnusedDeclaredDependencies
1 parent 8e3f4d5 commit f23e9b1

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

google-http-client/pom.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
<plugin>
2222
<groupId>org.apache.maven.plugins</groupId>
2323
<artifactId>maven-dependency-plugin</artifactId>
24-
<version>3.6.0</version>
2524
<configuration>
26-
<ignoredUnusedDeclaredDependencies>io.opencensus:opencensus-impl</ignoredUnusedDeclaredDependencies>
25+
<ignoredUnusedDeclaredDependencies>
26+
<ignoredUnusedDeclaredDependency>io.opencensus:opencensus-impl</ignoredUnusedDeclaredDependency>
27+
<ignoredUnusedDeclaredDependency>io.grpc:grpc-context</ignoredUnusedDeclaredDependency>
28+
</ignoredUnusedDeclaredDependencies>
2729
</configuration>
2830
</plugin>
2931
<plugin>
@@ -153,6 +155,15 @@
153155
<groupId>com.google.j2objc</groupId>
154156
<artifactId>j2objc-annotations</artifactId>
155157
</dependency>
158+
<dependency>
159+
<!--
160+
This grpc-context is not directly used but to override
161+
outdated grpc-context coming from opencensus-api
162+
https://github.com/googleapis/google-api-java-client/issues/2416
163+
-->
164+
<groupId>io.grpc</groupId>
165+
<artifactId>grpc-context</artifactId>
166+
</dependency>
156167
<dependency>
157168
<groupId>io.opencensus</groupId>
158169
<artifactId>opencensus-api</artifactId>

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,11 @@
238238
<artifactId>j2objc-annotations</artifactId>
239239
<version>2.8</version>
240240
</dependency>
241+
<dependency>
242+
<groupId>io.grpc</groupId>
243+
<artifactId>grpc-context</artifactId>
244+
<version>1.60.1</version>
245+
</dependency>
241246
<dependency>
242247
<groupId>io.opencensus</groupId>
243248
<artifactId>opencensus-api</artifactId>

0 commit comments

Comments
 (0)