diff --git a/.github/workflows/CI-workflow.yml b/.github/workflows/CI-workflow.yml index 3db050c3ed..fedc29a3a7 100644 --- a/.github/workflows/CI-workflow.yml +++ b/.github/workflows/CI-workflow.yml @@ -39,8 +39,8 @@ jobs: run: | plugin=`ls plugin/build/distributions/*.zip` echo MLCommons plugin $plugin - version=1.3.2 - plugin_version=1.3.2.0-SNAPSHOT + version=1.3.4 + plugin_version=1.3.4.0-SNAPSHOT echo Using OpenSearch $version with MLCommons $plugin_version cd .. if docker pull opensearchstaging/opensearch:$version diff --git a/build.gradle b/build.gradle index 72ac909542..59823841c0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.3.2-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT") // 1.3.0 -> 1.3.0.0, and 1.3.0-SNAPSHOT -> 1.3.0.0-SNAPSHOT opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') common_utils_version = System.getProperty("common_utils.version", opensearch_build) diff --git a/plugin/build.gradle b/plugin/build.gradle index 7d3299642d..28b99ced1d 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -44,7 +44,7 @@ dependencies { compile "org.opensearch.client:opensearch-rest-client:${opensearch_version}" compile "org.opensearch:common-utils:${common_utils_version}" compile("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}") - compile("com.fasterxml.jackson.core:jackson-databind:${versions.jackson}") + compile("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}") implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' @@ -241,6 +241,8 @@ configurations.all { resolutionStrategy.force 'junit:junit:4.12' resolutionStrategy.force 'org.apache.commons:commons-lang3:3.10' resolutionStrategy.force 'commons-logging:commons-logging:1.2' + // Resolve conflict with org.opensearch:opensearch:1.3.4-SNAPSHOT which using 2.13.2 + resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2' } apply plugin: 'nebula.ospackage'