Skip to content

deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0.with temp exclusions. #2512

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
arpan14 merged 1 commit into from
Jun 26, 2023
Merged

deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0.with temp exclusions. #2512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions google-cloud-spanner-executor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<!-- Temp exclusion. Remove next protobuf upgrade (to 3.23.3 or higher)
context: https://github.com/googleapis/sdk-platform-java/pull/1791#issuecomment-1601587713-->
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down Expand Up @@ -82,6 +90,14 @@
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
<version>1.4.0</version>
<!-- Temp exclusion. Remove next protobuf upgrade (to 3.23.3 or higher)
Copy link
Contributor

@arpan14 arpan14 Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. How would we ensure that this temp exclusion gets removed? Do we have a good internal tracking mechanism?
  2. How do we know that this may not introduce any other side effect? Any side effect that can be caused by excluding j2objc-annotations dependency? Or is this transitively getting included?

Copy link
Contributor Author

@zhumin8 zhumin8 Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. I can create a b ticket and internal note to track and ensure the release manager to remove this temp fix when protobuf upgrade for the shared-dependency. What do you think?
  2. This is transitively included. In fact multiple dependency have it included. So after this exclusion, j2objc-annotations is still available via
[INFO] --< com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1 >--
[INFO] Building proto-google-cloud-spanner-admin-instance-v1 6.43.1-SNAPSHOT [2/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ proto-google-cloud-spanner-admin-instance-v1 ---
[INFO] com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:32.0.1-jre:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] ---------< com.google.api.grpc:proto-google-cloud-spanner-v1 >----------
[INFO] Building proto-google-cloud-spanner-v1 6.43.1-SNAPSHOT            [3/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ proto-google-cloud-spanner-v1 ---
[INFO] com.google.api.grpc:proto-google-cloud-spanner-v1:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:32.0.1-jre:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] --< com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1 >--
[INFO] Building proto-google-cloud-spanner-admin-database-v1 6.43.1-SNAPSHOT [4/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ proto-google-cloud-spanner-admin-database-v1 ---
[INFO] com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:32.0.1-jre:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] --< com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1 >---
[INFO] Building grpc-google-cloud-spanner-admin-instance-v1 6.43.1-SNAPSHOT [5/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ grpc-google-cloud-spanner-admin-instance-v1 ---
[INFO] com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:32.0.1-jre:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] ----------< com.google.api.grpc:grpc-google-cloud-spanner-v1 >----------
[INFO] Building grpc-google-cloud-spanner-v1 6.43.1-SNAPSHOT             [6/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ grpc-google-cloud-spanner-v1 ---
[INFO] com.google.api.grpc:grpc-google-cloud-spanner-v1:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:32.0.1-jre:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] --< com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1 >---
[INFO] Building grpc-google-cloud-spanner-admin-database-v1 6.43.1-SNAPSHOT [7/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ grpc-google-cloud-spanner-admin-database-v1 ---
[INFO] com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.guava:guava:jar:32.0.1-jre:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] ---------------< com.google.cloud:google-cloud-spanner >----------------
[INFO] Building Google Cloud Spanner 6.43.1-SNAPSHOT                     [8/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ google-cloud-spanner ---
[INFO] com.google.cloud:google-cloud-spanner:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.api.grpc:grpc-google-common-protos:jar:2.21.0:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile
[INFO] 
[INFO] -----------< com.google.cloud:google-cloud-spanner-executor >-----------
[INFO] Building Google Cloud Spanner Executor 6.43.1-SNAPSHOT            [9/10]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO] 
[INFO] --- maven-dependency-plugin:3.5.0:tree (default-cli) @ google-cloud-spanner-executor ---
[INFO] com.google.cloud:google-cloud-spanner-executor:jar:6.43.1-SNAPSHOT
[INFO] \- com.google.http-client:google-http-client:jar:1.43.3:compile
[INFO]    \- com.google.j2objc:j2objc-annotations:jar:2.8:compile

Copy link
Contributor

@arpan14 arpan14 Jun 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Sure thanks for the clarification and having this transitively included ensures there are no others side effects.
  • Yes, internal ticket works to track removing this workaround.

context: https://github.com/googleapis/sdk-platform-java/pull/1791#issuecomment-1601587713-->
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
8 changes: 8 additions & 0 deletions google-cloud-spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,14 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<!-- Temp exclusion. Remove next protobuf upgrade (to 3.23.3 or higher)
context: https://github.com/googleapis/sdk-platform-java/pull/1791#issuecomment-1601587713-->
<exclusions>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-spanner-parent</site.installationModule>
<google.cloud.shared-dependencies.version>3.11.0</google.cloud.shared-dependencies.version>
<google.cloud.shared-dependencies.version>3.12.0</google.cloud.shared-dependencies.version>
</properties>

<dependencyManagement>
Expand Down