Skip to content

Updates testCompile mockito version to match OpenSearch changes#204

Merged
downsrob merged 1 commit intoopensearch-project:mainfrom
downsrob:updates-mockito
Oct 13, 2021
Merged

Updates testCompile mockito version to match OpenSearch changes#204
downsrob merged 1 commit intoopensearch-project:mainfrom
downsrob:updates-mockito

Conversation

@downsrob
Copy link
Copy Markdown
Contributor

Signed-off-by: Clay Downs downsrob@amazon.com

Description of changes: Alerting builds are failing due to a dependency version mismatch for mockito between OpenSearch and Alerting. This OpenSearch PR introduced the mockito version change.

CheckList:
[X] Commits are signed per the DCO using --signoff

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.

Signed-off-by: Clay Downs <downsrob@amazon.com>
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #204 (6170439) into main (7959450) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #204      +/-   ##
============================================
- Coverage     78.83%   78.82%   -0.02%     
+ Complexity      215      214       -1     
============================================
  Files           172      172              
  Lines          6951     6951              
  Branches        905      905              
============================================
- Hits           5480     5479       -1     
- Misses          986      989       +3     
+ Partials        485      483       -2     
Impacted Files Coverage Δ
...ing/destination/client/DestinationEmailClient.java 72.50% <0.00%> (-5.00%) ⬇️
...ing/model/destination/DestinationContextFactory.kt 66.66% <0.00%> (ø)
...ain/kotlin/org/opensearch/alerting/AlertService.kt 79.02% <0.00%> (+0.48%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7959450...6170439. Read the comment docs.

@downsrob downsrob marked this pull request as ready for review October 13, 2021 21:23
@downsrob downsrob merged commit dc6ecdc into opensearch-project:main Oct 13, 2021
@downsrob downsrob deleted the updates-mockito branch October 13, 2021 22:23
rishabhmaurya pushed a commit to rishabhmaurya/alerting-1 that referenced this pull request Nov 8, 2021
rishabhmaurya pushed a commit to rishabhmaurya/alerting-1 that referenced this pull request Nov 8, 2021
rishabhmaurya added a commit that referenced this pull request Nov 9, 2021
* Updates alerting version to 1.2 (#192)

* Updates alerting version to 1.2

* Adds snapshot repo to the repository file

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Update build to use public Maven repo (#184)

Signed-off-by: Abbas Hussain <abbas_10690@yahoo.com>

* Publish notification JARs checksums. (#196)

* Publish notification JARs checksums.

Signed-off-by: dblock <dblock@dblock.org>

* Remove sonatype staging.

Signed-off-by: dblock <dblock@dblock.org>

* Updates testCompile mockito version to match OpenSearch changes (#204)

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Update maven publication to include cksums. (#224)

This change adds a task to publish to a local staging repo under build/ that includes cksums.  It also updates build.sh to use this new task and copy the contents of the staging repo to the output directory.
The maven publish plugin will not include these cksums when publishing to maven local but will when published to a separate folder.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add release notes for 1.2.0.0 release (#225)

* Create opensearch-alerting.release-notes-1.2.0.0.md

Signed-off-by: Annie Lee <leeyun@amazon.com>

* Update opensearch-alerting.release-notes-1.2.0.0.md

* Update opensearch-alerting.release-notes-1.2.0.0.md

* Add backwards compatibility tests (#199)

* Initial commit for BWC tests

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update bwc test to check Monitor stats and add bwc tests to GitHub Actions

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Use current version plugin bundle from build for bwc tests instead of manually uploading

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update mockito-core dependency to 3.12.4 to prevent conflict

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Remove disabling security manager flag when running BWC tests

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: Clay Downs <89109232+downsrob@users.noreply.github.com>
Co-authored-by: Abbas Hussain <abbashus@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Co-authored-by: Annie Lee <71157062+leeyun-amzn@users.noreply.github.com>
Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
rishabhmaurya added a commit that referenced this pull request Nov 9, 2021
* Cherry-pick commits to 1.x (#227)

* Update copyright notice (#222)

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Admin Users must be able to access all monitors #139 (#220)

* Admin Users must be able to access all monitors #139

* Refactored

Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Co-authored-by: Sriram <59816283+skkosuri-amzn@users.noreply.github.com>

* Updates alerting version to 1.2 (#192)

* Updates alerting version to 1.2

* Adds snapshot repo to the repository file

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Update build to use public Maven repo (#184)

Signed-off-by: Abbas Hussain <abbas_10690@yahoo.com>

* Publish notification JARs checksums. (#196)

* Publish notification JARs checksums.

Signed-off-by: dblock <dblock@dblock.org>

* Remove sonatype staging.

Signed-off-by: dblock <dblock@dblock.org>

* Updates testCompile mockito version to match OpenSearch changes (#204)

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Update maven publication to include cksums. (#224)

This change adds a task to publish to a local staging repo under build/ that includes cksums.  It also updates build.sh to use this new task and copy the contents of the staging repo to the output directory.
The maven publish plugin will not include these cksums when publishing to maven local but will when published to a separate folder.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add release notes for 1.2.0.0 release (#225)

* Create opensearch-alerting.release-notes-1.2.0.0.md

Signed-off-by: Annie Lee <leeyun@amazon.com>

* Update opensearch-alerting.release-notes-1.2.0.0.md

* Update opensearch-alerting.release-notes-1.2.0.0.md

* Add backwards compatibility tests (#199)

* Initial commit for BWC tests

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update bwc test to check Monitor stats and add bwc tests to GitHub Actions

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Use current version plugin bundle from build for bwc tests instead of manually uploading

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update mockito-core dependency to 3.12.4 to prevent conflict

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Remove disabling security manager flag when running BWC tests

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Co-authored-by: Sriram <59816283+skkosuri-amzn@users.noreply.github.com>
Co-authored-by: Clay Downs <89109232+downsrob@users.noreply.github.com>
Co-authored-by: Abbas Hussain <abbashus@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Co-authored-by: Annie Lee <71157062+leeyun-amzn@users.noreply.github.com>
AWSHurneyt pushed a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Mar 30, 2022
* Updates alerting version to 1.2 (opensearch-project#192)

* Updates alerting version to 1.2

* Adds snapshot repo to the repository file

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Update build to use public Maven repo (opensearch-project#184)

Signed-off-by: Abbas Hussain <abbas_10690@yahoo.com>

* Publish notification JARs checksums. (opensearch-project#196)

* Publish notification JARs checksums.

Signed-off-by: dblock <dblock@dblock.org>

* Remove sonatype staging.

Signed-off-by: dblock <dblock@dblock.org>

* Updates testCompile mockito version to match OpenSearch changes (opensearch-project#204)

Signed-off-by: Clay Downs <downsrob@amazon.com>

* Update maven publication to include cksums. (opensearch-project#224)

This change adds a task to publish to a local staging repo under build/ that includes cksums.  It also updates build.sh to use this new task and copy the contents of the staging repo to the output directory.
The maven publish plugin will not include these cksums when publishing to maven local but will when published to a separate folder.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Add release notes for 1.2.0.0 release (opensearch-project#225)

* Create opensearch-alerting.release-notes-1.2.0.0.md

Signed-off-by: Annie Lee <leeyun@amazon.com>

* Update opensearch-alerting.release-notes-1.2.0.0.md

* Update opensearch-alerting.release-notes-1.2.0.0.md

* Add backwards compatibility tests (opensearch-project#199)

* Initial commit for BWC tests

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update bwc test to check Monitor stats and add bwc tests to GitHub Actions

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Use current version plugin bundle from build for bwc tests instead of manually uploading

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Update mockito-core dependency to 3.12.4 to prevent conflict

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

* Remove disabling security manager flag when running BWC tests

Signed-off-by: Mohammad Qureshi <qreshi@amazon.com>

Co-authored-by: Clay Downs <89109232+downsrob@users.noreply.github.com>
Co-authored-by: Abbas Hussain <abbashus@amazon.com>
Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org>
Co-authored-by: Marc Handalian <handalm@amazon.com>
Co-authored-by: Annie Lee <71157062+leeyun-amzn@users.noreply.github.com>
Co-authored-by: Mohammad Qureshi <47198598+qreshi@users.noreply.github.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants