chore: Merge main to protobuf-4.x-rc #4022
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove hardcoded clirr.skip=false in showcase-clirr check. This enables us to configure the clirr check in poms.
chore: update googleapis commit at Sat Nov 1 02:34:00 UTC 2025 --------- Co-authored-by: Blake Li <[email protected]>
🤖 I have created a release *beep* *boop* --- <details><summary>2.64.2</summary> ## [2.64.2](v2.64.1...v2.64.2) (2025-12-10) ### Bug Fixes * add per-service api_version to gapic_metadata ([#3984](#3984)) ([d589306](d589306)) ### Dependencies * Upgrade auth to 1.41.0. ([#4008](#4008)) ([833b3e5](833b3e5)) * upgrade grpc to 1.76.1 ([#3993](#3993)) ([958611e](958611e)) * Upgrade grpc to 1.76.2 ([#4006](#4006)) ([a8060a2](a8060a2)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
This PR contains the following updates: | Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---| | [com.google.api.grpc:grpc-google-common-protos](https://redirect.github.com/googleapis/sdk-platform-java) | `2.61.1` -> `2.63.2` |  |  | | [com.google.api.grpc:grpc-google-iam-v1](https://redirect.github.com/googleapis/sdk-platform-java) | `1.56.1` -> `1.58.2` |  |  | | [com.google.api.grpc:proto-google-common-protos](https://redirect.github.com/googleapis/sdk-platform-java) | `2.61.1` -> `2.63.2` |  |  | | [com.google.api.grpc:proto-google-iam-v1](https://redirect.github.com/googleapis/sdk-platform-java) | `1.56.1` -> `1.58.2` |  |  | | [com.google.api:api-common](https://redirect.github.com/googleapis/sdk-platform-java) | `2.53.1` -> `2.55.2` |  |  | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>googleapis/sdk-platform-java (com.google.api.grpc:grpc-google-common-protos)</summary> ### [`v2.63.0`](https://redirect.github.com/googleapis/sdk-platform-java/blob/HEAD/CHANGELOG.md#2630-2025-10-16) [Compare Source](https://redirect.github.com/googleapis/sdk-platform-java/compare/v2.62.0...v2.63.0) ##### Features - **librariangen:** add bazel package ([#​3940](https://redirect.github.com/googleapis/sdk-platform-java/issues/3940)) ([feabef3](https://redirect.github.com/googleapis/sdk-platform-java/commit/feabef32c4c45be0fb1db3615568365b902ece24)) - **librariangen:** add execv package ([#​3932](https://redirect.github.com/googleapis/sdk-platform-java/issues/3932)) ([f6b0b47](https://redirect.github.com/googleapis/sdk-platform-java/commit/f6b0b47a14eddd9c76540362b5922a5acc56b5d4)) - **librariangen:** add protoc package ([#​3935](https://redirect.github.com/googleapis/sdk-platform-java/issues/3935)) ([598de06](https://redirect.github.com/googleapis/sdk-platform-java/commit/598de0697957ea3b05b1347c0898108648c3d7d1)) - **librariangen:** add request package ([#​3933](https://redirect.github.com/googleapis/sdk-platform-java/issues/3933)) ([fe44aed](https://redirect.github.com/googleapis/sdk-platform-java/commit/fe44aede2aba9627db4aa0397d2ac4de353cea03)) - **librariangen:** scaffold Java language container for Librarian ([#​3926](https://redirect.github.com/googleapis/sdk-platform-java/issues/3926)) ([29d188d](https://redirect.github.com/googleapis/sdk-platform-java/commit/29d188d20e530570f46774b37d88703822774a33)) ##### Dependencies - Bump errorprone-annotations to v2.42.0 ([8d6c1f9](https://redirect.github.com/googleapis/sdk-platform-java/commit/8d6c1f915ba5f0c4ac9b89120e63dddd62e37a22)) - Bump guava to v33.5.0 ([8d6c1f9](https://redirect.github.com/googleapis/sdk-platform-java/commit/8d6c1f915ba5f0c4ac9b89120e63dddd62e37a22)) - Bump j2objc-annotations to v3.1 ([8d6c1f9](https://redirect.github.com/googleapis/sdk-platform-java/commit/8d6c1f915ba5f0c4ac9b89120e63dddd62e37a22)) - update google auth library dependencies to v1.40.0 ([#​3945](https://redirect.github.com/googleapis/sdk-platform-java/issues/3945)) ([1d74663](https://redirect.github.com/googleapis/sdk-platform-java/commit/1d7466332b5dc13fde6ed687247873135a5fa919)) - Upgrade Google Http Java Client to v2.0.2 ([#​3946](https://redirect.github.com/googleapis/sdk-platform-java/issues/3946)) ([7fb4f15](https://redirect.github.com/googleapis/sdk-platform-java/commit/7fb4f155eef478c1a66bc2f1fdecd7565d225b3e)) ### [`v2.62.0`](https://redirect.github.com/googleapis/sdk-platform-java/blob/HEAD/CHANGELOG.md#2620-2025-08-19) ##### Features - Set sampledToLocalTracing flag to true for all gRPC MethodDescriptors ([#​3874](https://redirect.github.com/googleapis/sdk-platform-java/issues/3874)) ([592e899](https://redirect.github.com/googleapis/sdk-platform-java/commit/592e899c516288b0a60b69525ba12d6f29bc6200)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/sdk-platform-java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMzEuOSIsInVwZGF0ZWRJblZlciI6IjQyLjQyLjIiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbXX0=-->
🤖 I have created a release *beep* *boop* --- <details><summary>2.64.3-SNAPSHOT</summary> ### Updating meta-information for bleeding-edge SNAPSHOT release. </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Blake Li <[email protected]>
Contributor
Summary of ChangesHello @blakeli0, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request merges the Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
diegomarquezp
approved these changes
Dec 11, 2025
Contributor
There was a problem hiding this comment.
Code Review
This pull request primarily consists of dependency version upgrades across numerous configuration files, which appears to be part of a release or merge process. The changes are largely consistent. However, I've identified a few inconsistencies in dependency versions between different configuration files (dependencies.txt, gax-java/dependencies.properties) and their corresponding pom.xml files. These should be synchronized to ensure build consistency and maintainability. Please see the detailed comments for specifics.
Comment on lines
+12
to
+19
| io.grpc:grpc-bom,grpc=1.76.2 | ||
| com.google.auth:google-auth-library-bom,google.auth=1.41.0 | ||
| com.google.http-client:google-http-client,google.http-client=2.0.2 | ||
| com.google.code.gson:gson,gson=2.13.2 | ||
| com.google.guava:guava,guava=33.4.8-jre | ||
| com.google.protobuf:protobuf-java,protobuf=4.31.1 | ||
| io.opentelemetry:opentelemetry-bom,opentelemetry=1.55.0 | ||
| com.google.errorprone:error_prone_annotations,errorprone=2.43.0 | ||
| com.google.guava:guava,guava=33.5.0-jre | ||
| com.google.protobuf:protobuf-java,protobuf=4.33.1 | ||
| io.opentelemetry:opentelemetry-bom,opentelemetry=1.57.0 | ||
| com.google.errorprone:error_prone_annotations,errorprone=2.45.0 |
Contributor
There was a problem hiding this comment.
There are several version inconsistencies between this file and gapic-generator-java-pom-parent/pom.xml. The comment on line 10 suggests these should be aligned.
Here's a comparison of the versions after your changes:
| Dependency | dependencies.txt |
gapic-generator-java-pom-parent/pom.xml |
|---|---|---|
google.auth |
1.41.0 |
1.42.0-rc1 |
google.http-client |
2.0.2 |
2.1.0-rc1 |
gson |
2.13.2 |
2.12.1 |
protobuf |
4.33.1 |
4.33.0 |
opentelemetry |
1.57.0 |
1.52.0 |
While grpc and guava versions are now consistent, others are not. Could you please synchronize these versions to avoid potential build or dependency issues?
Comment on lines
+38
to
+41
| maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.63.2 | ||
| maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.63.2 | ||
| maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.41.0 | ||
| maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.41.0 |
Contributor
There was a problem hiding this comment.
There seem to be some version mismatches between this file and the Maven POMs, which could lead to inconsistencies between different build systems.
- google-common-protos: This file uses version
2.63.2forproto-google-common-protosandgrpc-google-common-protos(lines 38-39), butgax-java/pom.xmluses2.63.3-SNAPSHOT. - google-auth-library: This file uses version
1.41.0forgoogle-auth-library-oauth2-httpandgoogle-auth-library-credentials(lines 40-41), butgapic-generator-java-pom-parent/pom.xml(the parent ofgax-java) definesgoogle.auth.versionas1.42.0-rc1.
I've also noticed similar inconsistencies for api-common (line 70) and proto-google-iam-v1/grpc-google-iam-v1 (lines 72-73).
To ensure consistency, could you please align these versions with those in the pom.xml files?
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge main to protobuf-4.x-rc. The main change from the main branch is grpc-java 1.76.2 upgrade.