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.

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

ORC-1777: Upgrade protobuf-java to 3.25.5 #2027

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Sep 19, 2024

Bumps com.google.protobuf:protobuf-java from 3.25.4 to 3.25.5.

Commits
  • 9d0ec0f Updating version.json and repo version numbers to: 25.5
  • 4a197e7 Merge pull request #18387 from protocolbuffers/cp-lp-25
  • b5a7cf7 Remove RecursiveGroup test case which doesn't exist in 25.x pre-Editions
  • f000b7e Fix merge conflict by adding optional label to proto2 unittest_lite.proto
  • 4728531 Add recursion check when parsing unknown fields in Java.
  • 850fcce Internal change
  • b704498 Internal change
  • e673479 Fix cord handling in DynamicMessage and oneofs. (#18375)
  • 8a60b65 Merge pull request #17704 from protocolbuffers/cp-segv
  • 94a2663 Fixed a SEGV when deep copying a non-reified sub-message.
  • Additional commits viewable in compare view

Most Recent Ignore Conditions Applied to This Pull Request
Dependency Name Ignore Conditions
com.google.protobuf:protobuf-java [>= 4.a, < 5]

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    You can disable automated security fix PRs for this repo from the Security Alerts page.

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.25.4 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](protocolbuffers/protobuf@v3.25.4...v3.25.5)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Sep 19, 2024
@dongjoon-hyun dongjoon-hyun changed the title Bump com.google.protobuf:protobuf-java from 3.25.4 to 3.25.5 in /java ORC-1777: Upgrade protobuf-java to 3.25.5 Sep 19, 2024
@dongjoon-hyun dongjoon-hyun added this to the 2.1.0 milestone Sep 19, 2024
Copy link
Member

@dongjoon-hyun dongjoon-hyun left a comment

Choose a reason for hiding this comment

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

+1, LGTM.

@dongjoon-hyun
Copy link
Member

Merged to main.

Copy link
Contributor Author

dependabot bot commented on behalf of github Sep 19, 2024

OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting @dependabot ignore this major version or @dependabot ignore this minor version. You can also ignore all major, minor, or patch releases for a dependency by adding an ignore condition with the desired update_types to your config file.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

@dependabot dependabot bot deleted the dependabot/maven/java/com.google.protobuf-protobuf-java-3.25.5 branch September 19, 2024 17:41
dongjoon-hyun pushed a commit that referenced this pull request Sep 19, 2024
Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.25.4 to 3.25.5.
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014"><code>9d0ec0f</code></a> Updating version.json and repo version numbers to: 25.5</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/4a197e78ad2430e22e992c5a7727b61ae220f727"><code>4a197e7</code></a> Merge pull request <a href="https://github.com/protocolbuffers/protobuf/issues/18387">#18387</a> from protocolbuffers/cp-lp-25</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/b5a7cf7cf4b7e39f6b02205e45afe2104a7faf81"><code>b5a7cf7</code></a> Remove RecursiveGroup test case which doesn't exist in 25.x pre-Editions</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/f000b7e18fd6921ca02ea4b87608e8cadcb7b64f"><code>f000b7e</code></a> Fix merge conflict by adding optional label to proto2 unittest_lite.proto</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/4728531c162f2f9e8c2ca1add713cfee2db6be3b"><code>4728531</code></a> Add recursion check when parsing unknown fields in Java.</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/850fcce9176e2c9070614dab53537760498c926b"><code>850fcce</code></a> Internal change</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/b7044987de77f1dc368fee558636d0b56d7e75e1"><code>b704498</code></a> Internal change</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/e67347986eaf7d777a6ee34367fa99f4912423ab"><code>e673479</code></a> Fix cord handling in DynamicMessage and oneofs. (<a href="https://github.com/protocolbuffers/protobuf/issues/18375">#18375</a>)</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/8a60b6527a976cfd0028153da3ad8e4ed280e0de"><code>8a60b65</code></a> Merge pull request <a href="https://github.com/protocolbuffers/protobuf/issues/17704">#17704</a> from protocolbuffers/cp-segv</li>
<li><a href="https://github.com/protocolbuffers/protobuf/commit/94a26630e362a4771b5ec80eac49f494988ca408"><code>94a2663</code></a> Fixed a SEGV when deep copying a non-reified sub-message.</li>
<li>Additional commits viewable in <a href="https://github.com/protocolbuffers/protobuf/compare/v3.25.4...v3.25.5">compare view</a></li>
</ul>
</details>
<br />

<details>
<summary>Most Recent Ignore Conditions Applied to This Pull Request</summary>

| Dependency Name | Ignore Conditions |
| --- | --- |
| com.google.protobuf:protobuf-java | [>= 4.a, < 5] |
</details>

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.protobuf:protobuf-java&package-manager=maven&previous-version=3.25.4&new-version=3.25.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `dependabot rebase` will rebase this PR
- `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `dependabot merge` will merge this PR after your CI passes on it
- `dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `dependabot cancel merge` will cancel a previously requested merge and block automerging
- `dependabot reopen` will reopen this PR if it is closed
- `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency
- `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/orc/network/alerts).

</details>

Closes #2027 from dependabot[bot]/dependabot/maven/java/com.google.protobuf-protobuf-java-3.25.5.

Authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
(cherry picked from commit 2fedfc5)
Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BUILD dependencies Pull requests that update a dependency file JAVA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant