Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

increment version to 1.3.6 and remove jackson force version #454

Merged
merged 1 commit into from
Oct 3, 2022
Merged

increment version to 1.3.6 and remove jackson force version #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
run: |
plugin=`ls plugin/build/distributions/*.zip`
echo MLCommons plugin $plugin
version=1.3.5
plugin_version=1.3.5.0-SNAPSHOT
version=1.3.6
plugin_version=1.3.6.0-SNAPSHOT
echo Using OpenSearch $version with MLCommons $plugin_version
cd ..
if docker pull opensearchstaging/opensearch:$version
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {

ext {
opensearch_group = "org.opensearch"
opensearch_version = System.getProperty("opensearch.version", "1.3.5-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "1.3.6-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)
Expand Down
2 changes: 1 addition & 1 deletion plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ configurations.all {
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'
// resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
}

apply plugin: 'nebula.ospackage'
Expand Down