From 7af8f207699d55f48ab1ca9ce92d0d54eee0a87e Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 8 Jan 2025 14:55:18 -0800 Subject: [PATCH 1/2] Fix github CI by adding eclipse dependency in formatting.gradle Signed-off-by: Varun Jain --- gradle/formatting.gradle | 2 +- .../java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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/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 95924112c..44671ed4a 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 0575a55ce0e602e1cd1e04db225ef3de969ffb15 Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 8 Jan 2025 15:02:27 -0800 Subject: [PATCH 2/2] Add changelog Signed-off-by: Varun Jain --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8820110fa..9a3e0d911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,4 +31,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Infrastructure ### Documentation ### Maintenance +- Fix github CI by adding eclipse dependency in formatting.gradle ([#1079](https://github.com/opensearch-project/neural-search/pull/1079)) ### Refactoring