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 <[email protected]>

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

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <[email protected]>

Signed-off-by: AWSHurneyt <[email protected]>
  • Loading branch information
AWSHurneyt authored and toepkerd-zz committed Sep 28, 2022
1 parent 54f0ed6 commit 61a935e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions alerting/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ configurations.all {
force "org.apache.httpcomponents:httpcore:${versions.httpcore}"
// force the version until OpenSearch upgrade to an invulnerable one, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
force "commons-codec:commons-codec:1.13"

// This is required because kotlin-coroutines-core 1.1.1 still requires kotlin stdlib 1.3.20 and we're using a higher kotlin version
force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
Expand Down Expand Up @@ -450,4 +450,4 @@ if (!usingRemoteCluster && !usingMultiNode) {
apply from: '../build-tools/opensearchplugin-coverage.gradle'
}

apply from: '../build-tools/pkgbuild.gradle'
apply from: '../build-tools/pkgbuild.gradle'

0 comments on commit 61a935e

Please sign in to comment.