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

[v0.6] Bump protobuf.version from 3.22.3 to 3.24.2 #3932

Closed
wants to merge 1 commit into from
Closed

[v0.6] Bump protobuf.version from 3.22.3 to 3.24.2 #3932

wants to merge 1 commit into from

Conversation

FlorianHockmann
Copy link
Member

Backport

This will backport the following commits from master to v0.6:

Questions ?

Please refer to the Backport tool documentation

@dependabot
Bump protobuf.version from 3.23.4 to 3.24.2
bc1dfc8 
Bumps `protobuf.version` from 3.23.4 to 3.24.2.

Updates `com.google.protobuf:protobuf-java` from 3.23.4 to 3.24.2
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](protocolbuffers/protobuf@v3.23.4...v3.24.2)

Updates `com.google.protobuf:protobuf-java-util` from 3.23.4 to 3.24.2

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.google.protobuf:protobuf-java-util
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit e8f3dc1)

# Conflicts:
#	pom.xml
@FlorianHockmann FlorianHockmann enabled auto-merge (rebase) August 30, 2023 09:21
@FlorianHockmann FlorianHockmann mentioned this pull request Aug 30, 2023
Merged
@FlorianHockmann FlorianHockmann changed the title [v0.6] Bump protobuf.version from 3.23.4 to 3.24.2 [v0.6] Bump protobuf.version from 3.22.3 to 3.24.2 Aug 30, 2023
@FlorianHockmann
Copy link
Member Author

Don't wonder about the bigger version bump here compared to master: v0.6 is still on 3.22.3 instead of 3.23.4 like on master because the latest update was done together with a Guava update which wasn't backported: #3897.

@FlorianHockmann FlorianHockmann added this to the Release v0.6.4 milestone Aug 30, 2023
@janusgraph-bot janusgraph-bot added the cla: external Externally-managed CLA label Aug 30, 2023
@FlorianHockmann
Copy link
Member Author

Backporting of this doesn't work as it contains a much newer version of j2objc-annotations than the one used in Guava which we didn't update in v0.6. This leads to dependency convergence errors. So, I'm closing this.

auto-merge was automatically disabled August 30, 2023 14:29

Pull request was closed

@FlorianHockmann FlorianHockmann removed this from the Release v0.6.4 milestone Aug 30, 2023
@FlorianHockmann FlorianHockmann deleted the backport/v0.6/pr-3927 branch August 30, 2023 14:29
@FlorianHockmann FlorianHockmann mentioned this pull request Sep 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport/skip cla: external Externally-managed CLA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FlorianHockmann @janusgraph-bot