From 6ad6546e55550a3d35589bca1d61e032640439af Mon Sep 17 00:00:00 2001 From: Varun Jain Date: Wed, 8 Jan 2025 15:29:41 -0800 Subject: [PATCH] Fix github CI by adding eclipse dependency in formatting.gradle (#1079) * Fix github CI by adding eclipse dependency in formatting.gradle Signed-off-by: Varun Jain * Add changelog Signed-off-by: Varun Jain --------- Signed-off-by: Varun Jain --- CHANGELOG.md | 1 + gradle/formatting.gradle | 2 +- .../java/org/opensearch/neuralsearch/bwc/HybridSearchIT.java | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 626ac7d21..6aebbc877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,4 +32,5 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### 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/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;