CI_change_opensearch_branch (#791)

* CI_change_opensearch_branch Signed-off-by: Varun Jain <[email protected]> * CI_change_opensearch_branch Signed-off-by: Varun Jain <[email protected]> * CI_change_opensearch_branch Signed-off-by: Varun Jain <[email protected]> --------- Signed-off-by: Varun Jain <[email protected]>
opensearch-project · Jan 28, 2023 · 1ba8bc6 · 1ba8bc6
1 parent 68910ff
commit 1ba8bc6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -22,14 +22,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: opensearch-project/OpenSearch
-          ref: feature/extensions
+          ref: main
           path: opensearch
 
       - name: Publish to Maven Local
         run: |
           ./opensearch/gradlew --project-dir ./opensearch/ publishToMavenLocal
 
-      - name: Assemble OpenSearch feature/extensions
+      - name: Assemble OpenSearch main
         run: |
           ./opensearch/gradlew --project-dir ./opensearch/ assemble
 

diff --git a/build.gradle b/build.gradle
@@ -755,7 +755,7 @@ dependencies {
 //    compileOnly "org.opensearch:opensearch-job-scheduler-spi:${job_scheduler_version}"
 //  Removed Common Utils dependency from AD
 //    implementation "org.opensearch:common-utils:${common_utils_version}"
-    implementation "org.opensearch:opensearch-sdk-java:1.0.0-SNAPSHOT"
+    implementation "org.opensearch.sdk:opensearch-sdk-java:1.0.0-SNAPSHOT"
     implementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"
     implementation "org.opensearch.client:opensearch-java:${opensearch_version}"
     implementation "org.opensearch.client:opensearch-rest-client:${opensearch_version}"

diff --git a/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java b/src/main/java/org/opensearch/ad/AnomalyDetectorExtension.java
@@ -107,7 +107,10 @@ public List<NamedXContentRegistry.Entry> getNamedXContent() {
     public OpenSearchClient getClient() {
         SDKClient sdkClient = new SDKClient();
         OpenSearchClient client = sdkClient
-            .initializeClient(getExtensionSettings().getOpensearchAddress(), Integer.parseInt(getExtensionSettings().getOpensearchPort()));
+            .initializeJavaClient(
+                getExtensionSettings().getOpensearchAddress(),
+                Integer.parseInt(getExtensionSettings().getOpensearchPort())
+            );
         return client;
     }