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

Main -> 1.x merge #228

Merged
merged 7 commits into from
Nov 9, 2021

Conversation

rishabhmaurya
Copy link
Collaborator

Issue #, if available:
Cherry-picked following commits -

63e2a3eb6956148cf12088cd521367f3c2b1dda5
948aa55d6d254f4cf877e9a437a3125c5197a03a
7959450a7bea855dd7d3c280b106ac8de116b146
dc6ecdc6ec482e1cc8ebc8f8a7fe11b774ebb607
621d75eeb9f0af8b6b409fab48d6eab6421a64ac
1066f0ca120ab0cb23d96af7c34e59b824e2b44d
11aafbe26189a474349d24c161ca956c044c7b63

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.

downsrob and others added 7 commits November 8, 2021 15:38
* 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 merged commit 107d72a into opensearch-project:1.x Nov 9, 2021
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.

7 participants