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.23.0 to 2.24.0 #3897

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Dec 25, 2023

Bumps com.google.errorprone:error_prone_annotations from 2.23.0 to 2.24.0.

Release notes

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

Error Prone 2.24.0

New checks:

Full Changelog: google/error-prone@v2.23.0...v2.24.0

Commits
  • 2cc8504 Release Error Prone 2.24.0
  • 21c190a Document that javadoc shouldn't appear between annotations and the documented...
  • d272dfa Automated rollback of commit 654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.
  • 654d1db Handle Joiner.on(...) in AbstractToString.
  • da7be27 Descend into VariableTrees when looking for variables to check.
  • affa37a Do not flag unused parameters on abstract methods.
  • d78dd6d Don't report NonFinalStaticField findings for fields modified in `@BeforeClas...
  • aadfdc3 WellKnownThreadSafety: Add common PKIX types to known thread-safe list.
  • ac52ca9 AutoValueFinalMethods: support method-level suppression.
  • 336323a Import eisop/checker-framework from GitHub.
  • Additional commits viewable 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)

Bumps [com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/google/error-prone/releases)
- [Commits](google/error-prone@v2.23.0...v2.24.0)

---
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 added the dependencies Pull requests that update a dependency file label Dec 25, 2023
@dependabot dependabot bot requested a review from RyanL1997 as a code owner December 25, 2023 06:24
@dependabot dependabot bot added the java Pull requests that update Java code label Dec 25, 2023
Copy link

codecov bot commented Dec 25, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (3c566a4) 65.18% compared to head (4c1a322) 65.17%.
Report is 3 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3897      +/-   ##
==========================================
- Coverage   65.18%   65.17%   -0.01%     
==========================================
  Files         298      298              
  Lines       21195    21195              
  Branches     3456     3456              
==========================================
- Hits        13815    13813       -2     
- Misses       5667     5668       +1     
- Partials     1713     1714       +1     

see 1 file with indirect coverage changes

@cwperks cwperks added the backport 2.x backport to 2.x branch label Dec 26, 2023
@cwperks cwperks merged commit 7734fde into main Dec 26, 2023
95 checks passed
@cwperks cwperks deleted the dependabot/gradle/com.google.errorprone-error_prone_annotations-2.24.0 branch December 26, 2023 14:53
@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-3897-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7734fde172aa7e514866fba2532bee4acf5389d3
# Push it to GitHub
git push --set-upstream origin backport/backport-3897-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-3897-to-2.x.

cwperks pushed a commit to cwperks/security that referenced this pull request Dec 28, 2023
…4.0 (opensearch-project#3897)

Bumps
[com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone)
from 2.23.0 to 2.24.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/google/error-prone/releases">com.google.errorprone:error_prone_annotations's
releases</a>.</em></p>
<blockquote>
<h2>Error Prone 2.24.0</h2>
<p>New checks:</p>
<ul>
<li><a
href="https://errorprone.info/bugpattern/MultipleNullnessAnnotations"><code>MultipleNullnessAnnotations</code></a>:
Discourage multiple nullness annotations</li>
<li><a
href="https://errorprone.info/bugpattern/NullableTypeParameter"><code>NullableTypeParameter</code></a>:
Discourage nullness annotations on type parameters</li>
<li><a
href="https://errorprone.info/bugpattern/NullableWildcard"><code>NullableWildcard</code></a>:
Discourage nullness annotations on wildcards</li>
<li><a
href="https://errorprone.info/bugpattern/SuperCallToObjectMethod"><code>SuperCallToObjectMethod</code></a>:
Generalization of <code>SuperEqualsIsObjectEquals</code>, now covers
<code>hashCode</code></li>
</ul>
<p>Full Changelog: <a
href="https://github.com/google/error-prone/compare/v2.23.0...v2.24.0">https://github.com/google/error-prone/compare/v2.23.0...v2.24.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/google/error-prone/commit/2cc850485e861ab415a75223bb722284de39fd8c"><code>2cc8504</code></a>
Release Error Prone 2.24.0</li>
<li><a
href="https://github.com/google/error-prone/commit/21c190a6fc76f3ad3c895639dc66b7a3f570c55d"><code>21c190a</code></a>
Document that javadoc shouldn't appear between annotations and the
documented...</li>
<li><a
href="https://github.com/google/error-prone/commit/d272dfa8da5f6ed09bb97acc153f9a7169185ab7"><code>d272dfa</code></a>
Automated rollback of commit
654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.</li>
<li><a
href="https://github.com/google/error-prone/commit/654d1dbf1e6dd652cd6e8ca003643ddf02266ec2"><code>654d1db</code></a>
Handle Joiner.on(...) in AbstractToString.</li>
<li><a
href="https://github.com/google/error-prone/commit/da7be27b3c4a9f7d232072fdf3dc95e553156b6d"><code>da7be27</code></a>
Descend into VariableTrees when looking for variables to check.</li>
<li><a
href="https://github.com/google/error-prone/commit/affa37ac76a9bd726e46ad6108a707436fdfeded"><code>affa37a</code></a>
Do not flag unused parameters on <em>abstract</em> methods.</li>
<li><a
href="https://github.com/google/error-prone/commit/d78dd6d355db050d1420b2b88068566f515cfd1e"><code>d78dd6d</code></a>
Don't report NonFinalStaticField findings for fields modified in
`@BeforeClas...</li>
<li><a
href="https://github.com/google/error-prone/commit/aadfdc3094310639c5e2b5ebe0119dc672910f84"><code>aadfdc3</code></a>
WellKnownThreadSafety: Add common PKIX types to known thread-safe
list.</li>
<li><a
href="https://github.com/google/error-prone/commit/ac52ca90fe3b84ed64026cdda243fb0c44afecbd"><code>ac52ca9</code></a>
AutoValueFinalMethods: support method-level suppression.</li>
<li><a
href="https://github.com/google/error-prone/commit/336323ab42c947ed71e395ba4c85956d36db3a0a"><code>336323a</code></a>
Import eisop/checker-framework from GitHub.</li>
<li>Additional commits viewable in <a
href="https://github.com/google/error-prone/compare/v2.23.0...v2.24.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=gradle&previous-version=2.23.0&new-version=2.24.0)](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)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 7734fde)
cwperks added a commit that referenced this pull request Dec 28, 2023
…m 2.23.0 to 2.24.0 (#3897) (#3902)

Backport of #3897 to 2.x

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
prabhask5 pushed a commit to prabhask5/opensearch-security that referenced this pull request Jan 11, 2024
…4.0 (opensearch-project#3897)

Bumps
[com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone)
from 2.23.0 to 2.24.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/google/error-prone/releases">com.google.errorprone:error_prone_annotations's
releases</a>.</em></p>
<blockquote>
<h2>Error Prone 2.24.0</h2>
<p>New checks:</p>
<ul>
<li><a
href="https://errorprone.info/bugpattern/MultipleNullnessAnnotations"><code>MultipleNullnessAnnotations</code></a>:
Discourage multiple nullness annotations</li>
<li><a
href="https://errorprone.info/bugpattern/NullableTypeParameter"><code>NullableTypeParameter</code></a>:
Discourage nullness annotations on type parameters</li>
<li><a
href="https://errorprone.info/bugpattern/NullableWildcard"><code>NullableWildcard</code></a>:
Discourage nullness annotations on wildcards</li>
<li><a
href="https://errorprone.info/bugpattern/SuperCallToObjectMethod"><code>SuperCallToObjectMethod</code></a>:
Generalization of <code>SuperEqualsIsObjectEquals</code>, now covers
<code>hashCode</code></li>
</ul>
<p>Full Changelog: <a
href="https://github.com/google/error-prone/compare/v2.23.0...v2.24.0">https://github.com/google/error-prone/compare/v2.23.0...v2.24.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/google/error-prone/commit/2cc850485e861ab415a75223bb722284de39fd8c"><code>2cc8504</code></a>
Release Error Prone 2.24.0</li>
<li><a
href="https://github.com/google/error-prone/commit/21c190a6fc76f3ad3c895639dc66b7a3f570c55d"><code>21c190a</code></a>
Document that javadoc shouldn't appear between annotations and the
documented...</li>
<li><a
href="https://github.com/google/error-prone/commit/d272dfa8da5f6ed09bb97acc153f9a7169185ab7"><code>d272dfa</code></a>
Automated rollback of commit
654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.</li>
<li><a
href="https://github.com/google/error-prone/commit/654d1dbf1e6dd652cd6e8ca003643ddf02266ec2"><code>654d1db</code></a>
Handle Joiner.on(...) in AbstractToString.</li>
<li><a
href="https://github.com/google/error-prone/commit/da7be27b3c4a9f7d232072fdf3dc95e553156b6d"><code>da7be27</code></a>
Descend into VariableTrees when looking for variables to check.</li>
<li><a
href="https://github.com/google/error-prone/commit/affa37ac76a9bd726e46ad6108a707436fdfeded"><code>affa37a</code></a>
Do not flag unused parameters on <em>abstract</em> methods.</li>
<li><a
href="https://github.com/google/error-prone/commit/d78dd6d355db050d1420b2b88068566f515cfd1e"><code>d78dd6d</code></a>
Don't report NonFinalStaticField findings for fields modified in
`@BeforeClas...</li>
<li><a
href="https://github.com/google/error-prone/commit/aadfdc3094310639c5e2b5ebe0119dc672910f84"><code>aadfdc3</code></a>
WellKnownThreadSafety: Add common PKIX types to known thread-safe
list.</li>
<li><a
href="https://github.com/google/error-prone/commit/ac52ca90fe3b84ed64026cdda243fb0c44afecbd"><code>ac52ca9</code></a>
AutoValueFinalMethods: support method-level suppression.</li>
<li><a
href="https://github.com/google/error-prone/commit/336323ab42c947ed71e395ba4c85956d36db3a0a"><code>336323a</code></a>
Import eisop/checker-framework from GitHub.</li>
<li>Additional commits viewable in <a
href="https://github.com/google/error-prone/compare/v2.23.0...v2.24.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=gradle&previous-version=2.23.0&new-version=2.24.0)](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)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Prabhas Kurapati <[email protected]>
dlin2028 pushed a commit to dlin2028/security that referenced this pull request May 1, 2024
…4.0 (opensearch-project#3897)

Bumps
[com.google.errorprone:error_prone_annotations](https://github.com/google/error-prone)
from 2.23.0 to 2.24.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/google/error-prone/releases">com.google.errorprone:error_prone_annotations's
releases</a>.</em></p>
<blockquote>
<h2>Error Prone 2.24.0</h2>
<p>New checks:</p>
<ul>
<li><a
href="https://errorprone.info/bugpattern/MultipleNullnessAnnotations"><code>MultipleNullnessAnnotations</code></a>:
Discourage multiple nullness annotations</li>
<li><a
href="https://errorprone.info/bugpattern/NullableTypeParameter"><code>NullableTypeParameter</code></a>:
Discourage nullness annotations on type parameters</li>
<li><a
href="https://errorprone.info/bugpattern/NullableWildcard"><code>NullableWildcard</code></a>:
Discourage nullness annotations on wildcards</li>
<li><a
href="https://errorprone.info/bugpattern/SuperCallToObjectMethod"><code>SuperCallToObjectMethod</code></a>:
Generalization of <code>SuperEqualsIsObjectEquals</code>, now covers
<code>hashCode</code></li>
</ul>
<p>Full Changelog: <a
href="https://github.com/google/error-prone/compare/v2.23.0...v2.24.0">https://github.com/google/error-prone/compare/v2.23.0...v2.24.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/google/error-prone/commit/2cc850485e861ab415a75223bb722284de39fd8c"><code>2cc8504</code></a>
Release Error Prone 2.24.0</li>
<li><a
href="https://github.com/google/error-prone/commit/21c190a6fc76f3ad3c895639dc66b7a3f570c55d"><code>21c190a</code></a>
Document that javadoc shouldn't appear between annotations and the
documented...</li>
<li><a
href="https://github.com/google/error-prone/commit/d272dfa8da5f6ed09bb97acc153f9a7169185ab7"><code>d272dfa</code></a>
Automated rollback of commit
654d1dbf1e6dd652cd6e8ca003643ddf02266ec2.</li>
<li><a
href="https://github.com/google/error-prone/commit/654d1dbf1e6dd652cd6e8ca003643ddf02266ec2"><code>654d1db</code></a>
Handle Joiner.on(...) in AbstractToString.</li>
<li><a
href="https://github.com/google/error-prone/commit/da7be27b3c4a9f7d232072fdf3dc95e553156b6d"><code>da7be27</code></a>
Descend into VariableTrees when looking for variables to check.</li>
<li><a
href="https://github.com/google/error-prone/commit/affa37ac76a9bd726e46ad6108a707436fdfeded"><code>affa37a</code></a>
Do not flag unused parameters on <em>abstract</em> methods.</li>
<li><a
href="https://github.com/google/error-prone/commit/d78dd6d355db050d1420b2b88068566f515cfd1e"><code>d78dd6d</code></a>
Don't report NonFinalStaticField findings for fields modified in
`@BeforeClas...</li>
<li><a
href="https://github.com/google/error-prone/commit/aadfdc3094310639c5e2b5ebe0119dc672910f84"><code>aadfdc3</code></a>
WellKnownThreadSafety: Add common PKIX types to known thread-safe
list.</li>
<li><a
href="https://github.com/google/error-prone/commit/ac52ca90fe3b84ed64026cdda243fb0c44afecbd"><code>ac52ca9</code></a>
AutoValueFinalMethods: support method-level suppression.</li>
<li><a
href="https://github.com/google/error-prone/commit/336323ab42c947ed71e395ba4c85956d36db3a0a"><code>336323a</code></a>
Import eisop/checker-framework from GitHub.</li>
<li>Additional commits viewable in <a
href="https://github.com/google/error-prone/compare/v2.23.0...v2.24.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.errorprone:error_prone_annotations&package-manager=gradle&previous-version=2.23.0&new-version=2.24.0)](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)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
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 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.

3 participants