Skip to content

Commit

Permalink
Cherry-picked 2.2 commits to main. (opensearch-project#518)
Browse files Browse the repository at this point in the history
* Bumping 2.x branch version from 2.1.0 to 2.2.0. Bumped mockito-core version from 4.3.1 to 4.6.1. (opensearch-project#506)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.2 release notes. (opensearch-project#514)

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
  • Loading branch information
AWSHurneyt authored and toepkerd-zz committed Sep 2, 2022
1 parent 050f42a commit 868d4cf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
4 changes: 2 additions & 2 deletions alerting/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ dependencies {
implementation "com.github.seancfoley:ipaddress:5.3.3"

testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}"
testImplementation "org.mockito:mockito-core:4.3.1"
testImplementation "org.mockito:mockito-core:4.6.1"
}

javadoc.enabled = false // turn off javadoc as it barfs on Kotlin code
Expand Down Expand Up @@ -257,7 +257,7 @@ String bwcRemoteFile = 'https://ci.opensearch.org/ci/dbc/bundle-build/1.1.0/2021
testClusters {
"${baseName}$i" {
testDistribution = "ARCHIVE"
versions = ["1.1.0", "2.1.0-SNAPSHOT"]
versions = ["1.1.0", "2.2.0-SNAPSHOT"]
numberOfNodes = 3
plugin(provider(new Callable<RegularFile>(){
@Override
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ buildscript {
apply from: 'build-tools/repositories.gradle'

ext {
opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
// 2.1.0-SNAPSHOT -> 2.1.0.0-SNAPSHOT
// 2.2.0-SNAPSHOT -> 2.2.0.0-SNAPSHOT
version_tokens = opensearch_version.tokenize('-')
opensearch_build = version_tokens[0] + '.0'
plugin_no_snapshot = opensearch_build
Expand Down
14 changes: 14 additions & 0 deletions release-notes/opensearch-alerting.release-notes-2.2.0.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## Version 2.2.0.0 2022-08-03

Compatible with OpenSearch 2.2.0

### Infrastructure
* Add support for reproducible builds. ([#472](https://github.com/opensearch-project/alerting/pull/472))

### Maintenance
* Staging for version increment automation. ([#489](https://github.com/opensearch-project/alerting/pull/489))
* Bumping 2.x branch version from 2.1.0 to 2.2.0. ([#506](https://github.com/opensearch-project/alerting/pull/506))
* Refactored backwards compatibility tests to point to the OpenSearch 1.1.0.0 zip following deprecation of ODFE. ([#510](https://github.com/opensearch-project/alerting/pull/510))

### Documentation
* Added 2.2 release notes. ([#514](https://github.com/opensearch-project/alerting/pull/514))

0 comments on commit 868d4cf

Please sign in to comment.