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

README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 #10772

Merged
merged 2 commits into from
Jan 2, 2024
Merged

README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 #10772

merged 2 commits into from
Jan 2, 2024

Conversation

sergiitk
Copy link
Member

@sergiitk sergiitk commented Dec 19, 2023 •
edited
Loading

  1. The bump to 3.23.4 was incorrectly done to the master README in Upgrade dependencies post v1.57.x branch cut #10359.
  2. This was reverted in README.md: Revert reference to protobuf 3.23.4 #10430.
  3. Then protobuf was upgraded again in 1.58.0, from 3.23.4 to 3.24.0 (f8baa9c)
  4. 1.58.0 release updated it to 3.24.0 for maven, but kept at 3.22.3 for gradle (75af7ab).

Notes:

  • This PR is to be backported to v1.60.x, v1.59.x, v1.58.x. No tag-level release needed.
  • After v1.61.0 is out, master README.md protobuf references will be bumped to 3.25.1.

@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.23.4
46b7121 
1. The bump to `3.23.4` was incorrectly done to the master README in
   grpc#10359.
2. This was reverted in grpc#10430.
3. 1.58.0 release updated it to `3.23.4` for maven, but kept
   at `3.22.3` for gradle (75af7ab).
@sergiitk sergiitk mentioned this pull request Dec 19, 2023
Merged
@sergiitk sergiitk added this to the 1.61 milestone Dec 19, 2023
@YifeiZhuang
Copy link
Contributor

protobuf was upgraded to 3.24.0since 1.58.0 f8baa9c
So this seems correct to me (75af7ab)

Why tell people protobuf version is 3.22.4 while we are using 3.24.0?

@sergiitk
Copy link
Member Author

@YifeiZhuang ah, good catch. Let me fix it then.

@YifeiZhuang
Copy link
Contributor

The latest is 3.25.1 updated since two weeks ago, https://github.com/grpc/grpc-java/blob/master/gradle/libs.versions.toml#L10. I think you need to update README to 3.25.1 instead.
Also, don't forget to update the PR title and commit to the correct version number.

@sergiitk
Copy link
Member Author

sergiitk commented Dec 26, 2023 •
edited
Loading

@YifeiZhuang Yes, I've upgraded protobuf to 3.25.1 a few weeks ago, but README.md for the new versions is updated during the release procedure. See notes in PR description:

After v1.61.0 is out, master README.md protobuf references will be bumped to 3.25.1.

@sergiitk sergiitk changed the title README.md: Correct gradle protobuf reference from 3.22.3 to 3.23.4 README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 Dec 26, 2023
YifeiZhuang
YifeiZhuang approved these changes Dec 27, 2023
View reviewed changes
Copy link
Contributor

@YifeiZhuang YifeiZhuang left a comment

Choose a reason for hiding this comment

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

On I see, so you will update protobuf version to the 1.61 branch later on.
I think it is fine to just update the newest version to master branch README.md before release procedure on the RELEASING.md so that it saves you one step. But either way.

@sergiitk
Copy link
Member Author

sergiitk commented Jan 2, 2024

@YifeiZhuang no - this line is updated after the tag is published, so README.md would be broken for 2 weeks between the branch cut and the release.

But thanks for the review!

@sergiitk sergiitk merged commit 062f7a2 into grpc:master Jan 2, 2024
14 checks passed
@sergiitk sergiitk deleted the fix-protobuf-readme branch January 2, 2024 19:40
sergiitk added a commit to sergiitk/grpc-java that referenced this pull request Jan 2, 2024
@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 (g…
af74b41 
…rpc#10772)

1. The bump to `3.23.4` was incorrectly done to the master README in
   grpc#10359.
2. This was reverted in grpc#10430.
3. Then protobuf was upgraded again in 1.58.0, from `3.23.4` to
   `3.24.0` (f8baa9c)
4. 1.58.0 release updated it to `3.24.0` for maven, but kept at
  `3.22.3` for gradle (75af7ab).
sergiitk added a commit to sergiitk/grpc-java that referenced this pull request Jan 2, 2024
@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 (g…
cf76332 
…rpc#10772)

1. The bump to `3.23.4` was incorrectly done to the master README in
   grpc#10359.
2. This was reverted in grpc#10430.
3. Then protobuf was upgraded again in 1.58.0, from `3.23.4` to
   `3.24.0` (f8baa9c)
4. 1.58.0 release updated it to `3.24.0` for maven, but kept at
  `3.22.3` for gradle (75af7ab).
sergiitk added a commit to sergiitk/grpc-java that referenced this pull request Jan 2, 2024
@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 (g…
04799db 
…rpc#10772)

1. The bump to `3.23.4` was incorrectly done to the master README in
   grpc#10359.
2. This was reverted in grpc#10430.
3. Then protobuf was upgraded again in 1.58.0, from `3.23.4` to
   `3.24.0` (f8baa9c)
4. 1.58.0 release updated it to `3.24.0` for maven, but kept at
  `3.22.3` for gradle (75af7ab).
This was referenced Jan 2, 2024
Merged
Merged
Merged
sergiitk added a commit that referenced this pull request Jan 2, 2024
@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 (#…
c83e5f9 
…10772) (#10788)

1. The bump to `3.23.4` was incorrectly done to the master README in
   #10359.
2. This was reverted in #10430.
3. Then protobuf was upgraded again in 1.58.0, from `3.23.4` to
   `3.24.0` (f8baa9c)
4. 1.58.0 release updated it to `3.24.0` for maven, but kept at
  `3.22.3` for gradle (75af7ab).
sergiitk added a commit that referenced this pull request Jan 2, 2024
@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 (#…
6077e52 
…10772) (#10789)

1. The bump to `3.23.4` was incorrectly done to the master README in
   #10359.
2. This was reverted in #10430.
3. Then protobuf was upgraded again in 1.58.0, from `3.23.4` to
   `3.24.0` (f8baa9c)
4. 1.58.0 release updated it to `3.24.0` for maven, but kept at
  `3.22.3` for gradle (75af7ab).
sergiitk added a commit that referenced this pull request Jan 2, 2024
@sergiitk
README.md: Correct gradle protobuf reference from 3.22.3 to 3.24.0 (#…
72d831d 
…10772) (#10790)

1. The bump to `3.23.4` was incorrectly done to the master README in
   #10359.
2. This was reverted in #10430.
3. Then protobuf was upgraded again in 1.58.0, from `3.23.4` to
   `3.24.0` (f8baa9c)
4. 1.58.0 release updated it to `3.24.0` for maven, but kept at
  `3.22.3` for gradle (75af7ab).
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@YifeiZhuang YifeiZhuang YifeiZhuang approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.61
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sergiitk @YifeiZhuang