From 715adf905b4378f87e9a2a388027859837abf208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Thu, 21 Nov 2024 11:03:40 +0100 Subject: [PATCH] Migrate master to 2.18.0 (#149) * 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](https://github.com/mockito/mockito/compare/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] * Remove mockito from test dependencies The version bundled with OpenSearch is used instead --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- plugins/command-manager/build.gradle | 4 +--- plugins/setup/build.gradle | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/command-manager/build.gradle b/plugins/command-manager/build.gradle index 74bf23d..69655c3 100644 --- a/plugins/command-manager/build.gradle +++ b/plugins/command-manager/build.gradle @@ -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") } @@ -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", @@ -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 diff --git a/plugins/setup/build.gradle b/plugins/setup/build.gradle index d0f48bb..1163a17 100644 --- a/plugins/setup/build.gradle +++ b/plugins/setup/build.gradle @@ -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") }