Skip to content

Commit

Permalink
ORC-1777: Upgrade protobuf-java to 3.25.5
Browse files Browse the repository at this point in the history
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://redirect.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://redirect.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://redirect.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 <[email protected]>
(cherry picked from commit 2fedfc5)
Signed-off-by: Dongjoon Hyun <[email protected]>
  • Loading branch information
dependabot[bot] authored and dongjoon-hyun committed Sep 19, 2024
1 parent 95d1382 commit 8b71128
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<orc-format.version>1.0.0</orc-format.version>
<!-- Build Properties -->
<project.build.outputTimestamp>2024-08-11T21:58:47Z</project.build.outputTimestamp>
<protobuf.version>3.25.4</protobuf.version>
<protobuf.version>3.25.5</protobuf.version>
<slf4j.version>2.0.11</slf4j.version>
<storage-api.version>2.8.1</storage-api.version>
<surefire.version>3.0.0-M5</surefire.version>
Expand Down

0 comments on commit 8b71128

Please sign in to comment.