From 45b8277af14a9e3a09e9a93442539ec9762a9806 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 15:54:06 -0800 Subject: [PATCH] [AUTO] Increment version to 2.6.0-SNAPSHOT (#738) * Increment version to 2.6.0-SNAPSHOT Signed-off-by: opensearch-ci-bot * fix failures Signed-off-by: Ashish Agrawal --------- Signed-off-by: opensearch-ci-bot Signed-off-by: Ashish Agrawal Co-authored-by: opensearch-ci-bot Co-authored-by: Ashish Agrawal --- alerting/build.gradle | 2 +- .../org/opensearch/percolator/PercolateQueryBuilderExt.java | 2 +- build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alerting/build.gradle b/alerting/build.gradle index b4dabdef4..be6c88cd3 100644 --- a/alerting/build.gradle +++ b/alerting/build.gradle @@ -92,7 +92,7 @@ dependencies { implementation "com.github.seancfoley:ipaddress:5.3.3" testImplementation "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" - testImplementation "org.mockito:mockito-core:4.7.0" + testImplementation "org.mockito:mockito-core:5.1.0" testImplementation "org.opensearch.plugin:reindex-client:${opensearch_version}" } diff --git a/alerting/src/main/java/org/opensearch/percolator/PercolateQueryBuilderExt.java b/alerting/src/main/java/org/opensearch/percolator/PercolateQueryBuilderExt.java index 33f67641e..e74b84c0e 100644 --- a/alerting/src/main/java/org/opensearch/percolator/PercolateQueryBuilderExt.java +++ b/alerting/src/main/java/org/opensearch/percolator/PercolateQueryBuilderExt.java @@ -54,7 +54,7 @@ import org.apache.lucene.util.BitDocIdSet; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.SetOnce; +import org.opensearch.common.SetOnce; import org.opensearch.OpenSearchException; import org.opensearch.ResourceNotFoundException; import org.opensearch.Version; diff --git a/build.gradle b/build.gradle index fe7ed38bc..89b3638b7 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { apply from: 'build-tools/repositories.gradle' ext { - opensearch_version = System.getProperty("opensearch.version", "2.5.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.6.0-SNAPSHOT") buildVersionQualifier = System.getProperty("build.version_qualifier", "") isSnapshot = "true" == System.getProperty("build.snapshot", "true") // 2.4.0-SNAPSHOT -> 2.4.0.0-SNAPSHOT