From 90f3f3d1b8e94cb6de5b3c223a31e8a746997509 Mon Sep 17 00:00:00 2001 From: Hailong Cui Date: Mon, 5 Aug 2024 14:22:14 +0800 Subject: [PATCH] fix version mismatch with opensearch core (#2800) Signed-off-by: Hailong Cui --- build.gradle | 5 +++++ memory/build.gradle | 2 +- search-processors/build.gradle | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index de733abfa6..f08ab08286 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import org.opensearch.gradle.VersionProperties + /* * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 @@ -79,6 +81,9 @@ allprojects { plugins.withId('jacoco') { jacoco.toolVersion = '0.8.10' } + + project.getExtensions().getExtraProperties().set("versions", VersionProperties.getVersions()); + } subprojects { diff --git a/memory/build.gradle b/memory/build.gradle index d833f0b0a4..b6198509d0 100644 --- a/memory/build.gradle +++ b/memory/build.gradle @@ -26,7 +26,7 @@ plugins { dependencies { implementation project(path: ":${rootProject.name}-common", configuration: 'shadow') implementation group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" - implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: '5.2.2' + implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "${versions.httpcore5}" implementation "org.opensearch:common-utils:${common_utils_version}" implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre' testImplementation (group: 'junit', name: 'junit', version: '4.13.2') { diff --git a/search-processors/build.gradle b/search-processors/build.gradle index cfef1379dd..9f1f0c62d4 100644 --- a/search-processors/build.gradle +++ b/search-processors/build.gradle @@ -35,7 +35,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.2' + implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "${versions.httpcore5}" implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre' implementation group: 'org.json', name: 'json', version: '20231013' implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'