From 84b9dc6c2a3f78284fa48b74ed3c75c285c01473 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 8 Jan 2025 15:29:41 -0800 Subject: [PATCH 1/3] Fix github CI by adding eclipse dependency in formatting.gradle Signed-off-by: Varun Jain --- CHANGELOG.md | 2 ++ gradle/formatting.gradle | 2 +- .../java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java | 2 -- .../java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea11030c5..6e3ab4802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,4 +29,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fix CI for JDK upgrade towards 21 ([#835](https://github.com/opensearch-project/neural-search/pull/835)) ### Documentation ### Maintenance +- Add reindex integration tests for ingest processors ([#1075](https://github.com/opensearch-project/neural-search/pull/1075)) +- Fix github CI by adding eclipse dependency in formatting.gradle ([#1079](https://github.com/opensearch-project/neural-search/pull/1079)) ### Refactoring diff --git a/gradle/formatting.gradle b/gradle/formatting.gradle index 98720b5d4..d412e2132 100644 --- a/gradle/formatting.gradle +++ b/gradle/formatting.gradle @@ -7,7 +7,7 @@ allprojects { target '**/*.java' removeUnusedImports() - eclipse().configFile rootProject.file('formatter/formatterConfig.xml') + eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/")).configFile rootProject.file('formatter/formatterConfig.xml') trimTrailingWhitespace() endWithNewline(); diff --git a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java index d4ae88a3f..d2657555d 100644 --- a/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java +++ b/qa/restart-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java @@ -13,8 +13,6 @@ import org.opensearch.index.query.MatchQueryBuilder; -import static org.opensearch.knn.index.query.KNNQueryBuilder.EXPAND_NESTED_FIELD; -import static org.opensearch.neuralsearch.common.MinClusterVersionUtil.isClusterOnOrAfterMinReqVersion; import static org.opensearch.neuralsearch.util.TestUtils.getModelId; import static org.opensearch.neuralsearch.util.TestUtils.NODES_BWC_CLUSTER; import static org.opensearch.neuralsearch.util.TestUtils.PARAM_NAME_WEIGHTS; diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java index 78caca0e0..95ee51eb5 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java @@ -20,7 +20,6 @@ import static org.opensearch.neuralsearch.util.TestUtils.getModelId; import org.opensearch.index.query.QueryBuilder; -import org.opensearch.index.query.QueryBuilders; import org.opensearch.knn.index.query.rescore.RescoreContext; import org.opensearch.neuralsearch.query.HybridQueryBuilder; import org.opensearch.neuralsearch.query.NeuralQueryBuilder; From be97e8e168b00b35fd1e2ae9d61bfded1f5dbee3 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 8 Jan 2025 15:38:30 -0800 Subject: [PATCH 2/3] rebase with 2.x Signed-off-by: Varun Jain --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e3ab4802..09352a892 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fix CI for JDK upgrade towards 21 ([#835](https://github.com/opensearch-project/neural-search/pull/835)) ### Documentation ### Maintenance -- Add reindex integration tests for ingest processors ([#1075](https://github.com/opensearch-project/neural-search/pull/1075)) - Fix github CI by adding eclipse dependency in formatting.gradle ([#1079](https://github.com/opensearch-project/neural-search/pull/1079)) ### Refactoring From 38c41d226c79d3a5bde88095653a138d68ed6c92 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 8 Jan 2025 15:43:36 -0800 Subject: [PATCH 3/3] Rebase with main Signed-off-by: Varun Jain --- .../java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java index 95ee51eb5..78caca0e0 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java @@ -20,6 +20,7 @@ import static org.opensearch.neuralsearch.util.TestUtils.getModelId; import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.knn.index.query.rescore.RescoreContext; import org.opensearch.neuralsearch.query.HybridQueryBuilder; import org.opensearch.neuralsearch.query.NeuralQueryBuilder;