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

deps(maven): bump mockito-bom from 4.10.0 to 5.3.1 #12533

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Apr 24, 2023

Bumps mockito-bom from 4.10.0 to 5.3.1.

Release notes

Sourced from mockito-bom's releases.

v5.3.1

Changelog generated by Shipkit Changelog Gradle Plugin

5.3.1

v5.3.0

Changelog generated by Shipkit Changelog Gradle Plugin

5.3.0

v5.2.0

Changelog generated by Shipkit Changelog Gradle Plugin

5.2.0

... (truncated)

Commits
  • baf59c4 Weakens visibility constraint for spy constructors (#2983)
  • 02b9634 Fix NPE for handling Object (#2976)
  • 6ffd23e Add ArgumentMatchers#assertArg method (#2949)
  • 203132d Add withoutAnnotations parameter to @Mock (#2965)
  • 84a5eee Fix ClassCastException regression with parameterized types with InjectMocks (...
  • d65bba7 Bump versions.bytebuddy from 1.14.3 to 1.14.4 (#2966)
  • 600eaa0 Bump com.diffplug.spotless from 6.17.0 to 6.18.0 (#2967)
  • f9fbf50 Bump org.codehaus.groovy:groovy from 3.0.16 to 3.0.17 (#2959)
  • 0b8685c Bump versions.bytebuddy from 1.14.2 to 1.14.3 (#2950)
  • 5486617 Correct visibility check to respect nestmates (#2948)
  • 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 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 the dependencies Pull requests that update a dependency file label Apr 24, 2023
@lenaschoenburg
Copy link
Member

@dependabot rebase

Bumps [mockito-bom](https://github.com/mockito/mockito) from 4.10.0 to 5.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v4.10.0...v5.3.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-bom
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/maven/main/org.mockito-mockito-bom-5.3.1 branch from 9e6e972 to b7a9515 Compare May 12, 2023 07:07
This was there to ensure that we don't accidentally break compatibility
with Java 8.
As it turns out, we already make use of the `--release` feature in javac
which ensures that we don't accidentally start using newer APIs.
For example, adding a line such as `Set.of(1, 2, 3).stream().toList();`
to the java client results in a failure to compile.

See also https://openjdk.org/jeps/247
Copy link
Member

@lenaschoenburg lenaschoenburg left a comment

Choose a reason for hiding this comment

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

bors r+

@zeebe-bors-camunda
Copy link
Contributor

Build succeeded:

@zeebe-bors-camunda zeebe-bors-camunda bot merged commit 9f1b2d6 into main May 12, 2023
29 of 31 checks passed
@zeebe-bors-camunda zeebe-bors-camunda bot deleted the dependabot/maven/main/org.mockito-mockito-bom-5.3.1 branch May 12, 2023 08:52
@npepinpe npepinpe added backport stable/8.0 backport stable/8.2 Backport a pull request to 8.2.x labels May 31, 2023
@npepinpe
Copy link
Member

/backport

I'm backporting this as already some tests which we want to backport use things from Mockito 5 =/ Since it's a test library and not production, I don't think it's a big issue to back port a major release.

@backport-action
Copy link
Collaborator

Backport failed for stable/8.0, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.0
git worktree add -d .worktree/backport-12533-to-stable/8.0 origin/stable/8.0
cd .worktree/backport-12533-to-stable/8.0
git checkout -b backport-12533-to-stable/8.0
ancref=$(git merge-base cd9f8c73c5de83543b964f5b22ab84660de35947 d1d4128d2ea099fcd2b991ba3c333fbac18b9874)
git cherry-pick -x $ancref..d1d4128d2ea099fcd2b991ba3c333fbac18b9874

@backport-action
Copy link
Collaborator

Backport failed for stable/8.1, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin stable/8.1
git worktree add -d .worktree/backport-12533-to-stable/8.1 origin/stable/8.1
cd .worktree/backport-12533-to-stable/8.1
git checkout -b backport-12533-to-stable/8.1
ancref=$(git merge-base cd9f8c73c5de83543b964f5b22ab84660de35947 d1d4128d2ea099fcd2b991ba3c333fbac18b9874)
git cherry-pick -x $ancref..d1d4128d2ea099fcd2b991ba3c333fbac18b9874

@backport-action
Copy link
Collaborator

Successfully created backport PR for stable/8.2:

zeebe-bors-camunda bot added a commit that referenced this pull request May 31, 2023
12907: [Backport stable/8.2] deps(maven): bump mockito-bom from 4.10.0 to 5.3.1 r=npepinpe a=backport-action

# Description
Backport of #12533 to `stable/8.2`.

relates to 

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
zeebe-bors-camunda bot added a commit that referenced this pull request May 31, 2023
12909: [Backport stable/8.1] Remove JDK 8 from build r=oleschoenburg a=npepinpe

## Description

This PR backports #12533 to stable/8.1.

## Related issues

backports #12533



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
zeebe-bors-camunda bot added a commit that referenced this pull request May 31, 2023
12890: [Backport stable/8.0] Event subprocess attaches to inner instance of multi-instance only r=korthout a=backport-action

# Description
Backport of #12877 to `stable/8.0`.

relates to #11578

12908: [Backport stable/8.0] Remove JDK 8 specific build r=oleschoenburg a=npepinpe

## Description

This PR backports removing the JDK 8 build, and upgrading Mockito to 5.

## Related issues

backport #12533



Co-authored-by: Nico Korthout <nico.korthout@camunda.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ole Schönburg <ole.schoenburg@gmail.com>
@lenaschoenburg lenaschoenburg added version:8.1.13 Marks an issue as being completely or in parts released in 8.1.13 version:8.2.6 Marks an issue as being completely or in parts released in 8.2.6 release/8.0.16 labels Jun 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport stable/8.2 Backport a pull request to 8.2.x dependencies Pull requests that update a dependency file version:8.1.13 Marks an issue as being completely or in parts released in 8.1.13 version:8.2.6 Marks an issue as being completely or in parts released in 8.2.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants