Skip to content

Main->1.2 merge#230

Merged
rishabhmaurya merged 8 commits intoopensearch-project:1.2from
rishabhmaurya:main-1.2-merge
Nov 9, 2021
Merged

Main->1.2 merge#230
rishabhmaurya merged 8 commits intoopensearch-project:1.2from
rishabhmaurya:main-1.2-merge

Conversation

@rishabhmaurya
Copy link
Copy Markdown
Collaborator

Issue #, if available:
Cherry-picked following commits from main -
63e2a3e
948aa55
7959450
dc6ecdc
621d75e
1066f0c
11aafbe
Description of changes:

CheckList:
[ ] 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.

rishabhmaurya and others added 8 commits November 5, 2021 17:06
* Update copyright notice (opensearch-project#222)

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

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

* Admin Users must be able to access all monitors opensearch-project#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

* Adds snapshot repo to the repository file

Signed-off-by: Clay Downs <downsrob@amazon.com>
Signed-off-by: Abbas Hussain <abbas_10690@yahoo.com>
* Publish notification JARs checksums.

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

* Remove sonatype staging.

Signed-off-by: dblock <dblock@dblock.org>
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>
* 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
* 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>
@rishabhmaurya rishabhmaurya requested a review from qreshi November 9, 2021 00:40
@rishabhmaurya rishabhmaurya changed the base branch from main to 1.2 November 9, 2021 00:40
@rishabhmaurya rishabhmaurya merged commit 43f1e31 into opensearch-project:1.2 Nov 9, 2021
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.

7 participants