Fix mockito core conflict. #2128
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Vamsi Manohar <[email protected]>
vmmusings
requested review from
pjfitzgibbons,
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
mengweieric,
Swiddis,
penghuo,
seankao-az,
MaxKsyunz,
Yury-Fridlyand,
anirudha,
forestmvey,
acarbonetto and
GumpacG
as code owners
joshuali925
previously approved these changes
Sep 22, 2023
There was a problem hiding this comment.
can this be directly from core https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/version.properties#L56
seankao-az
previously approved these changes
Sep 22, 2023
was thinking about this...but went ahead with this PR. will try to use that variable. |
Codecov Report
@@ Coverage Diff @@
## main #2128 +/- ##
=========================================
Coverage 97.27% 97.27%
Complexity 4623 4623
=========================================
Files 410 410
Lines 11947 11947
Branches 828 828
=========================================
Hits 11621 11621
Misses 317 317
Partials 9 9
Flags with carried forward coverage won't be shown. Click here to find out more. |
Signed-off-by: Vamsi Manohar <[email protected]>
vmmusings
dismissed stale reviews from seankao-az and joshuali925
via
086bc74
joshuali925
approved these changes
Sep 22, 2023
YANG-DB
approved these changes
Sep 22, 2023
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Sep 22, 2023
* Fix mockito core Signed-off-by: Vamsi Manohar <[email protected]> * Use mockito version from core Signed-off-by: Vamsi Manohar <[email protected]> --------- Signed-off-by: Vamsi Manohar <[email protected]> (cherry picked from commit 6ae767c) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
vmmusings
pushed a commit
that referenced
this pull request
Sep 22, 2023
* Fix mockito core * Use mockito version from core --------- (cherry picked from commit 6ae767c) Signed-off-by: Vamsi Manohar <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fix mockito core conflicts with core.
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.