search

cryostatio / cryostat

Secure JDK Flight Recorder management for containerized JVMs
https://cryostat.io
Other
20 stars 10 forks source link

build(deps): bump com.google.protobuf:protobuf-java from 3.25.2 to 3.25.5 (backport #675) #676

Closed mergify[bot] closed 1 month ago

mergify[bot] commented 1 month ago

Bumps com.google.protobuf:protobuf-java from 3.25.2 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 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/cryostatio/cryostat/network/alerts).
This is an automatic backport of pull request #675 done by [Mergify](https://mergify.com).
mergify[bot] commented 1 month ago

Cherry-pick of 5eb83ab8d7d7077dc51c6e1137321b97564debb9 has failed:

On branch mergify/bp/cryostat-v3.0/pr-675
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit 5eb83ab.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   pom.xml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally