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

Bump com.google.errorprone:error_prone_annotations from 2.34.0 to 2.35.1 #4850

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Oct 28, 2024

Bumps com.google.errorprone:error_prone_annotations from 2.34.0 to 2.35.1.

Release notes

Sourced from com.google.errorprone:error_prone_annotations's releases.

Error Prone 2.35.1

Error Prone's dependency on protobuf has been downgraded to 3.25.5 for this release.

Version 3.25.5 of protobuf still fixes CVE-2024-7254. This release is provided for users who aren't ready to update to 4.x, see also #4584 and #4634. Future versions of Error Prone will upgrade back to protobuf 4.x.

Full changelog: google/error-prone@v2.35.0...v2.35.1

Error Prone 2.35.0

Changes:

  • Fix handling of \s before the trailing delimiter in MisleadingEscapedSpace
  • TimeUnitMismatch improvements: handle binary trees, consider trees like fooSeconds * 1000 to have units of millis

New checks:

Full changelog: google/error-prone@v2.34.0...v2.35.0

Commits
  • 0e06cc2 Release Error Prone 2.35.1
  • db6c890 Downgrade protobuf version to 3.25.5
  • ed6b121 Add a repro test for broken behavior inlining the parameter value into the fu...
  • a931fa3 Remove DoNotUseRuleChain from JavaCodeClarity.
  • ec2983b compileUnsafe -> compile for compile-time-constant expressions.
  • 2ce9632 Strip the quotation marks from the source code when reconstructing the literal.
  • 99a0d9d TimeUnitMismatch: handle BinaryTrees.
  • 60c5f76 TimeUnitMismatch: consider trees like fooSeconds * 1000 to have units of `m...
  • 427b51d GetSeconds to ToSeconds error prone
  • See full diff in compare view

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)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Oct 28, 2024
@cwperks
Copy link
Member

cwperks commented Oct 28, 2024

@dependabot rebase

@cwperks cwperks added the backport 2.x backport to 2.x branch label Oct 28, 2024
Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.34.0 to 2.35.1.
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](google/error-prone@v2.34.0...v2.35.1)

---
updated-dependencies:
- dependency-name: com.google.errorprone:error_prone_annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/gradle/com.google.errorprone-error_prone_annotations-2.35.1 branch from 8d30d1a to 6a8829f Compare October 28, 2024 20:44
@cwperks cwperks merged commit 28000a3 into main Oct 28, 2024
44 of 45 checks passed
@cwperks cwperks deleted the dependabot/gradle/com.google.errorprone-error_prone_annotations-2.35.1 branch October 28, 2024 21:25
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-4850-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 28000a3c58f15665307ae55dafa7351e3241436f
# Push it to GitHub
git push --set-upstream origin backport/backport-4850-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-4850-to-2.x.

cwperks added a commit that referenced this pull request Oct 29, 2024
…m 2.34.0 to 2.35.1 (#4850) (#4858)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch backport-failed dependencies Pull requests that update a dependency file java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants