Skip to content

Commit

Permalink
Migrate master to 2.18.0 (#149)
Browse files Browse the repository at this point in the history
* Migrate to OpenSearch 2.18.0

* Bump org.mockito:mockito-core in /plugins/command-manager

Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.12.0 to 5.14.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v5.12.0...v5.14.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Remove mockito from test dependencies

The version bundled with OpenSearch is used instead

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
AlexRuiz7 and dependabot[bot] authored Nov 21, 2024
1 parent e3248bb commit 715adf9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions plugins/command-manager/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.opensearch.gradle.test.RestIntegTestTask

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.17.1-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.18.0-SNAPSHOT")
wazuh_version = System.getProperty("version", "5.0.0")
revision = System.getProperty("revision", "0")
}
Expand Down Expand Up @@ -80,7 +80,6 @@ def versions = [
// TLS support. Used by Apache Http Client ??
conscrypt: "2.5.2",
// Test libraries
mockito: "5.12.0",
junit: "4.13.2",
// Jackson is used to manage JSON objects (serialization / deserialization)
jackson: "2.17.2",
Expand All @@ -100,7 +99,6 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"

testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "junit:junit:${versions.junit}"

// imposter
Expand Down
2 changes: 1 addition & 1 deletion plugins/setup/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.opensearch.gradle.test.RestIntegTestTask

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.17.1-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.18.0-SNAPSHOT")
wazuh_version = System.getProperty("version", "5.0.0")
revision = System.getProperty("revision", "0")
}
Expand Down

0 comments on commit 715adf9

Please sign in to comment.