Merge pull request opensearch-project#69 from rursprung/2.x

adapt to OpenSearch 2.x
rursprung · Jun 5, 2024 · 561666f · 561666f
2 parents d5f3c83 + 486c74e
commit 561666f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -39,4 +39,4 @@ jobs:
       if: matrix.os != 'windows-latest'
       run: |
           # Task to auto update version to the next development iteration
-          ./gradlew updateVersion -DnewVersion=2.1.0-SNAPSHOT
+          ./gradlew updateVersion -DnewVersion=2.15.0-SNAPSHOT
diff --git a/build.gradle b/build.gradle
@@ -63,7 +63,7 @@ validateNebulaPom.enabled = false
 
 buildscript {
     ext {
-        opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.14.0")
     }
 
     repositories {
@@ -114,6 +114,8 @@ run {
     useCluster testClusters.integTest
 }
 
+dependencyLicenses.enabled = false
+
 // updateVersion: Task to auto update version to the next development iteration
 task updateVersion {
     onlyIf { System.getProperty('newVersion') }

diff --git a/src/test/java/org/opensearch/path/to/plugin/RenamePluginIT.java b/src/test/java/org/opensearch/path/to/plugin/RenamePluginIT.java
@@ -8,8 +8,8 @@
 package org.opensearch.path.to.plugin;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-import org.apache.hc.core5.http.ParseException;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.http.ParseException;
+import org.apache.http.util.EntityUtils;
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.plugins.Plugin;