Skip to content

chore: revert exclusion for j2objc-annotations #2029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegomarquezp merged 2 commits into from
Sep 22, 2023
Merged

chore: revert exclusion for j2objc-annotations #2029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5c78b3
chore: revert exclusion for `j2objc-annotations`
diegomarquezp Sep 22, 2023
39c3b98
remove temporary solution message
diegomarquezp Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions gapic-generator-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,12 +424,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
Expand Down
3 changes: 0 additions & 3 deletions gax-java/dependencies.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ version.gax_httpjson=2.34.1-SNAPSHOT
# The protobuf version is only used for generating gradle files for showcase module,
# not for self-service clients (from googleapis project).

# On next protobuf upgrade (to 3.23.3 or higher),
# remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
# For context: https://github.com/googleapis/sdk-platform-java/pull/1791
version.com_google_protobuf=3.24.3
version.google_java_format=1.15.0
version.io_grpc=1.58.0
Expand Down
8 changes: 1 addition & 7 deletions gax-java/gax-httpjson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -117,4 +111,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
6 changes: 0 additions & 6 deletions java-core/google-cloud-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down