From 060147a43a5a2f35368be9790ac7edd8a588a563 Mon Sep 17 00:00:00 2001 From: HenryL27 Date: Tue, 3 Oct 2023 13:39:49 -0700 Subject: [PATCH] fix http library version Signed-off-by: HenryL27 --- memory/build.gradle | 2 +- .../ml/rest/RestMemoryCreateConversationActionIT.java | 6 +++--- .../ml/rest/RestMemoryCreateInteractionActionIT.java | 6 +++--- .../ml/rest/RestMemoryDeleteConversationActionIT.java | 6 +++--- .../ml/rest/RestMemoryGetConversationsActionIT.java | 6 +++--- .../ml/rest/RestMemoryGetInteractionsActionIT.java | 6 +++--- search-processors/build.gradle | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/memory/build.gradle b/memory/build.gradle index 1c67e02c7f..3a481507fb 100644 --- a/memory/build.gradle +++ b/memory/build.gradle @@ -26,7 +26,7 @@ plugins { dependencies { implementation project(":opensearch-ml-common") implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" - implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.1' + implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.2' implementation "org.opensearch:common-utils:${common_utils_version}" implementation group: 'com.google.guava', name: 'guava', version: '32.0.1-jre' testImplementation (group: 'junit', name: 'junit', version: '4.13.2') { diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateConversationActionIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateConversationActionIT.java index 26f1486f3f..23ef15d1fc 100644 --- a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateConversationActionIT.java +++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateConversationActionIT.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Map; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.message.BasicHeader; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.message.BasicHeader; import org.junit.Before; import org.opensearch.client.Response; import org.opensearch.core.rest.RestStatus; diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateInteractionActionIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateInteractionActionIT.java index 63f7093b6e..1cf0cd34ce 100644 --- a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateInteractionActionIT.java +++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryCreateInteractionActionIT.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.util.Map; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.message.BasicHeader; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.message.BasicHeader; import org.junit.Before; import org.opensearch.client.Response; import org.opensearch.core.rest.RestStatus; diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryDeleteConversationActionIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryDeleteConversationActionIT.java index 3bdb7ed213..14995ddb5b 100644 --- a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryDeleteConversationActionIT.java +++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryDeleteConversationActionIT.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.Map; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.message.BasicHeader; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.message.BasicHeader; import org.junit.Before; import org.opensearch.client.Response; import org.opensearch.core.rest.RestStatus; diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetConversationsActionIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetConversationsActionIT.java index 4c95296b08..2112793166 100644 --- a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetConversationsActionIT.java +++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetConversationsActionIT.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.Map; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.message.BasicHeader; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.message.BasicHeader; import org.junit.Before; import org.opensearch.client.Response; import org.opensearch.core.rest.RestStatus; diff --git a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetInteractionsActionIT.java b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetInteractionsActionIT.java index 3272d4a991..eeba9e4aab 100644 --- a/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetInteractionsActionIT.java +++ b/plugin/src/test/java/org/opensearch/ml/rest/RestMemoryGetInteractionsActionIT.java @@ -21,9 +21,9 @@ import java.util.ArrayList; import java.util.Map; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.message.BasicHeader; +import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHeaders; +import org.apache.hc.core5.http.message.BasicHeader; import org.junit.Before; import org.opensearch.client.Response; import org.opensearch.core.rest.RestStatus; diff --git a/search-processors/build.gradle b/search-processors/build.gradle index 3d5903a0d3..3911cf407e 100644 --- a/search-processors/build.gradle +++ b/search-processors/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation project(':opensearch-ml-memory') implementation group: 'org.opensearch', name: 'common-utils', version: "${common_utils_version}" // https://mvnrepository.com/artifact/org.apache.httpcomponents.core5/httpcore5 - implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.1' + implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.2' implementation("com.google.guava:guava:32.0.1-jre") implementation group: 'org.json', name: 'json', version: '20230227' implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'