-
Notifications
You must be signed in to change notification settings - Fork 73
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
dependabot: bump org.mockito:mockito-core from 5.11.0 to 5.12.0 #628
Conversation
@dependabot rebase |
Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v5.11.0...v5.12.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
a527b5e
to
7ab40e8
Compare
Its failing because of the conflict, the
I suspect its from here https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties#L60. |
@prudhvigodithi I'll raise a PR to update this in core. We can close this PR and open a separate one to refer to the version coming from core to avoid a mismatch in version and get this to auto-bump when the version from core is bumped. |
Cool thanks @cwperks. |
OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting If you change your mind, just re-open this PR and I'll resolve any conflicts on it. |
Core PR: opensearch-project/OpenSearch#13665 |
Bumps org.mockito:mockito-core from 5.11.0 to 5.12.0.
Release notes
Sourced from org.mockito:mockito-core's releases.
Commits
12cef84
AdditionalMatchers.and() and or() swap matcher order (#3335)f3821ff
Bump com.gradle.enterprise from 3.17.2 to 3.17.3 (#3341)25ad018
Bump org.jetbrains.kotlin:kotlin-stdlib from 1.9.23 to 1.9.24 (#3339)de38124
Bump versions.bytebuddy from 1.14.14 to 1.14.15 (#3338)88e8481
Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.9.23 to 1.9.24 (#3336)8c222c2
Bump org.shipkit:shipkit-auto-version from 2.0.6 to 2.0.7 (#3337)fb9ff6d
Bump gradle/wrapper-validation-action from 3.3.1 to 3.3.2 (#3327)af70125
Bump versions.bytebuddy from 1.14.13 to 1.14.14 (#3324)1eac76b
Bump org.shipkit:shipkit-auto-version from 2.0.5 to 2.0.6 (#3322)cd512ab
Bump gradle/wrapper-validation-action from 3.3.0 to 3.3.1 (#3320)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)