Skip to content

Commit 97bf9ed

Browse files
chore: revert exclusion for j2objc-annotations (#2029)
* chore: revert exclusion for `j2objc-annotations` * remove temporary solution message
1 parent 47531bf commit 97bf9ed

File tree

4 files changed

+1
-22
lines changed

4 files changed

+1
-22
lines changed

gapic-generator-java/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -424,12 +424,6 @@
424424
<dependency>
425425
<groupId>com.google.protobuf</groupId>
426426
<artifactId>protobuf-java-util</artifactId>
427-
<exclusions>
428-
<exclusion>
429-
<groupId>com.google.j2objc</groupId>
430-
<artifactId>j2objc-annotations</artifactId>
431-
</exclusion>
432-
</exclusions>
433427
</dependency>
434428
<dependency>
435429
<groupId>io.grpc</groupId>

gax-java/dependencies.properties

-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ version.gax_httpjson=2.34.1-SNAPSHOT
2626
# The protobuf version is only used for generating gradle files for showcase module,
2727
# not for self-service clients (from googleapis project).
2828

29-
# On next protobuf upgrade (to 3.23.3 or higher),
30-
# remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
31-
# For context: https://github.com/googleapis/sdk-platform-java/pull/1791
3229
version.com_google_protobuf=3.24.3
3330
version.google_java_format=1.15.0
3431
version.io_grpc=1.58.0

gax-java/gax-httpjson/pom.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,6 @@
6767
<dependency>
6868
<groupId>com.google.protobuf</groupId>
6969
<artifactId>protobuf-java-util</artifactId>
70-
<exclusions>
71-
<exclusion>
72-
<groupId>com.google.j2objc</groupId>
73-
<artifactId>j2objc-annotations</artifactId>
74-
</exclusion>
75-
</exclusions>
7670
</dependency>
7771
<dependency>
7872
<groupId>com.google.code.findbugs</groupId>
@@ -117,4 +111,4 @@
117111
</plugin>
118112
</plugins>
119113
</build>
120-
</project>
114+
</project>

java-core/google-cloud-core/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
<dependency>
3434
<groupId>com.google.protobuf</groupId>
3535
<artifactId>protobuf-java-util</artifactId>
36-
<exclusions>
37-
<exclusion>
38-
<groupId>com.google.j2objc</groupId>
39-
<artifactId>j2objc-annotations</artifactId>
40-
</exclusion>
41-
</exclusions>
4236
</dependency>
4337
<dependency>
4438
<groupId>com.google.api.grpc</groupId>

0 commit comments

Comments
 (0)