From 486c74e7b8536a68753f3c727151673f38d267d4 Mon Sep 17 00:00:00 2001 From: Ralph Ursprung Date: Wed, 5 Jun 2024 10:21:05 +0200 Subject: [PATCH] adapt to OpenSearch 2.x resolves #66 Signed-off-by: Ralph Ursprung --- .github/workflows/CI.yml | 2 +- build.gradle | 4 +++- .../java/org/opensearch/path/to/plugin/RenamePluginIT.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eac3ff8..b4d2d0a 100644 --- 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 index be395b9..b92ac38 100644 --- 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 index d5f4dd7..24d8889 100644 --- 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;