Skip to content

Commit 553151a

Browse files
ludochgae-java-bot
authored andcommitted
Add transitive dep of grpc context needed for opencensus potential usage in remote-api #381
PiperOrigin-RevId: 775667546 Change-Id: Iea17274d5ab9b4174a7c4ca1d5b8cb35384cb0ee
1 parent f88c142 commit 553151a

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
lines changed

appengine-api-1.0-sdk/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<name>AppEngine :: appengine-api-1.0-sdk</name>
2727
<description>API for Google App Engine standard environment with some of the dependencies shaded (repackaged)</description>
2828
<dependencies>
29+
<dependency> <!-- needed for remote_api for opencensus. -->
30+
<groupId>io.grpc</groupId>
31+
<artifactId>grpc-api</artifactId>
32+
<version>1.73.0</version>
33+
<optional>true</optional>
34+
</dependency>
2935
<dependency>
3036
<groupId>com.google.appengine</groupId>
3137
<artifactId>appengine-apis</artifactId>
@@ -383,7 +389,6 @@
383389
<includes>
384390
<include>com/google/appengine/api/taskqueue/*</include>
385391
<include>com/google/apphosting/datastore/**</include>
386-
<include>com/google/apphosting/utils/remoteapi/*</include>
387392
<include>com/google/common/annotations/GoogleInternal*</include>
388393
<include>com/google/common/base/StringUtil*</include>
389394
<include>com/google/common/util/concurrent/internal/*</include>
@@ -514,6 +519,8 @@
514519
<include>org.codehaus.jackson:jackson-core-asl:*</include>
515520
<include>io.opencensus:opencensus-api:*</include>
516521
<include>io.opencensus:opencensus-contrib-http-util:*</include>
522+
<!-- needed for remote_api for opencensus. -->
523+
<include>io.grpc:grpc-api:*</include>
517524
</includes>
518525
</artifactSet>
519526
</configuration>

remoteapi/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,6 @@
6767
</goals>
6868
<configuration>
6969
<relocations>
70-
<relocation>
71-
<pattern>ccom.google.api.client.googleapis.extensions.appengine.auth.oauth2</pattern>
72-
<shadedPattern>com.google.appengine.repackaged.com.google.api.client.googleapis.extensions.appengine.auth.oauth2</shadedPattern>
73-
</relocation>
74-
<relocation>
75-
<pattern>ccom.google.api.client.googleapis.extensions.appengine.testing.auth.oauth2</pattern>
76-
<shadedPattern>com.google.appengine.repackaged.com.google.api.client.googleapis.extensions.appengine.testing.auth.oauth2</shadedPattern>
77-
</relocation>
78-
<relocation>
79-
<pattern>ccom.google.api.client.googleapis.extensions.appengine.notifications</pattern>
80-
<shadedPattern>com.google.appengine.repackaged.com.google.api.client.googleapis.extensions.appengine.notifications</shadedPattern>
81-
</relocation>
8270
<relocation>
8371
<pattern>com.fasterxml.jackson</pattern>
8472
<shadedPattern>com.google.appengine.repackaged.com.fasterxml.jackson</shadedPattern>
@@ -114,10 +102,6 @@
114102
<relocation>
115103
<pattern>org.codehaus.jackson</pattern>
116104
<shadedPattern>com.google.appengine.repackaged.org.codehaus.jackson</shadedPattern>
117-
</relocation>
118-
<relocation>
119-
<pattern>com.google.apphosting.datastore.DatastoreV3Pb</pattern>
120-
<shadedPattern>com.google.apphosting.api.DatastorePb</shadedPattern>
121105
</relocation>
122106
<relocation>
123107
<pattern>com.google.apphosting.datastore.proto2api.DatastoreV3Pb</pattern>

0 commit comments

Comments
 (0)