Skip to content
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

Jump to bottom

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

Merged
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

merged 1 commit into from Jun 26, 2023

Conversation

zhumin8
Copy link
Contributor

@zhumin8 zhumin8 commented Jun 26, 2023 •
edited

Temp exclusions are needed to avoid dependency version discrepancy due to 3.23.2.
For more context: googleapis/sdk-platform-java#1791 (comment)
@suztomo Can you take a look if this temp fix looks okay?

Closes #2509

@zhumin8 zhumin8 requested review from a team as code owners June 26, 2023 15:50
@product-auto-label product-auto-label bot added size: s Pull request size is small. api: spanner Issues related to the googleapis/java-spanner API. labels Jun 26, 2023
@zhumin8
Copy link
Contributor Author

zhumin8 commented Jun 26, 2023 •
edited

ci/windows error

D:\a\java-spanner\java-spanner>"C:\Program Files\Git\bin\bash.exe" D:\a\java-spanner\java-spanner\.kokoro\build.sh 
/c/ProgramData/chocolatey/lib/maven/apache-maven-3.8.7/bin/mvn: line 92: cd: C:\Program Files\Eclipse Adoptium\jdk-11.0.18.10-hotspot\: No such file or directory
The JAVA_HOME environment variable is not defined correctly,
this environment variable is needed to run this program.

This looks to be failing for a while, not this pr specific.

arpan14
arpan14 reviewed Jun 26, 2023
View reviewed changes
google-cloud-spanner-executor/pom.xml
@@ -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
Collaborator

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

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
Collaborator

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.

@arpan14 arpan14 merged commit ce04645 into main Jun 26, 2023
20 of 21 checks passed
@arpan14 arpan14 deleted the shared-dep-updated branch June 26, 2023 16:29
@release-please release-please bot mentioned this pull request Jun 26, 2023
Merged
gcf-merge-on-green bot pushed a commit that referenced this pull request Jun 26, 2023
@release-please
chore(main): release 6.43.1 (#2502)
67eba48 
🤖 I have created a release *beep* *boop*
---


## [6.43.1](https://togithub.com/googleapis/java-spanner/compare/v6.43.0...v6.43.1) (2023-06-26)


### Dependencies

* Update dependency com.google.cloud:google-cloud-monitoring to v3.20.0 ([#2492](https://togithub.com/googleapis/java-spanner/issues/2492)) ([faa6807](https://togithub.com/googleapis/java-spanner/commit/faa68073673e789e35b600dab72152591a647dc6))
* Update dependency com.google.cloud:google-cloud-monitoring to v3.21.0 ([#2510](https://togithub.com/googleapis/java-spanner/issues/2510)) ([f10400b](https://togithub.com/googleapis/java-spanner/commit/f10400baf2d320991e75794250b9e1b2fb218718))
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.12.0.with temp exclusions. ([#2512](https://togithub.com/googleapis/java-spanner/issues/2512)) ([ce04645](https://togithub.com/googleapis/java-spanner/commit/ce0464527ef489d351b9086f6bb8922f295f1897))
* Update dependency com.google.cloud:google-cloud-trace to v2.19.0 ([#2493](https://togithub.com/googleapis/java-spanner/issues/2493)) ([1dc7cea](https://togithub.com/googleapis/java-spanner/commit/1dc7cea723658c43b8c8d2e085c964371fb72223))
* Update dependency com.google.cloud:google-cloud-trace to v2.20.0 ([#2511](https://togithub.com/googleapis/java-spanner/issues/2511)) ([2ea52ec](https://togithub.com/googleapis/java-spanner/commit/2ea52ec1cef2468e6c36b76797a3878f270badaa))
* Update dependency commons-io:commons-io to v2.13.0 ([#2490](https://togithub.com/googleapis/java-spanner/issues/2490)) ([b087b0e](https://togithub.com/googleapis/java-spanner/commit/b087b0e813cacb4f08d12815d9371fe9c004ca9e))
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.23 ([#2500](https://togithub.com/googleapis/java-spanner/issues/2500)) ([0b794a6](https://togithub.com/googleapis/java-spanner/commit/0b794a68d57eb990e013fdd05c72eaed868497b0))
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.23 ([#2501](https://togithub.com/googleapis/java-spanner/issues/2501)) ([9db5c78](https://togithub.com/googleapis/java-spanner/commit/9db5c7850b53fa10d1856d88908d5e8e95467206))
* Update dependency org.json:json to v20230618 ([#2504](https://togithub.com/googleapis/java-spanner/issues/2504)) ([8a87fee](https://togithub.com/googleapis/java-spanner/commit/8a87fee19bb2dd41495a15740893375c8778f71a))

---
This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please).
@zhumin8 zhumin8 mentioned this pull request Jun 28, 2023
Merged
@JoeWang1127 JoeWang1127 mentioned this pull request Oct 12, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arpan14 arpan14 arpan14 approved these changes

Assignees
No one assigned
Labels
api: spanner Issues related to the googleapis/java-spanner API. size: s Pull request size is small.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@zhumin8 @arpan14