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

Incremented version to 1.3.4. #681

Merged
merged 2 commits into from
Jul 13, 2022
Merged

Incremented version to 1.3.4. #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e5ec69
Incremented version to 1.3.4.
zelinh Jul 7, 2022
9194eed
bump jackson to 2.13.2
joshuali925 Jul 13, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/sql-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: SQL Java CI
on: [push, pull_request]

env:
OPENSEARCH_VERSION: '1.3.3-SNAPSHOT'
OPENSEARCH_VERSION: '1.3.4-SNAPSHOT'

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sql-workbench-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [pull_request, push]
env:
PLUGIN_NAME: query-workbench-dashboards
OPENSEARCH_VERSION: '1.3'
OPENSEARCH_PLUGIN_VERSION: 1.3.3.0
OPENSEARCH_PLUGIN_VERSION: 1.3.4.0

jobs:

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 @@ -6,7 +6,7 @@

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "1.3.3-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "1.3.4-SNAPSHOT")
}

repositories {
Expand Down
2 changes: 1 addition & 1 deletion doctest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ doctest.finalizedBy stopOpenSearch
build.dependsOn doctest
clean.dependsOn(cleanBootstrap)

String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.3/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-1.3.3.0.zip'
String mlCommonsRemoteFile = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.4/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-ml-1.3.4.0.zip'
String mlCommonsPlugin = "ml-commons"

testClusters {
Expand Down
2 changes: 0 additions & 2 deletions integ-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ configurations.all {
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.12.6'
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6'
}

dependencies {
Expand Down
8 changes: 4 additions & 4 deletions opensearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ dependencies {
compile project(':core')
compile group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
compile "io.github.resilience4j:resilience4j-retry:1.5.0"
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.6'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6'
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.12.6'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2'
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2'
compile group: 'org.json', name: 'json', version:'20180813'
compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
compile group: 'org.opensearch', name:'opensearch-ml-client', version: '1.3.3.0-SNAPSHOT'
compile group: 'org.opensearch', name:'opensearch-ml-client', version: '1.3.4.0-SNAPSHOT'

testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
Expand Down
3 changes: 0 additions & 3 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,9 @@ configurations.all {
resolutionStrategy.force 'junit:junit:4.13.2'
// conflict with spring-jcl
exclude group: "commons-logging", module: "commons-logging"
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.12.6'
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6'
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions protocol/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ plugins {

dependencies {
compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.6'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6'
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.12.6'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2'
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2'
implementation 'com.google.code.gson:gson:2.8.9'
compile project(':core')
compile project(':opensearch')
Expand Down
4 changes: 2 additions & 2 deletions workbench/opensearch_dashboards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "queryWorkbenchDashboards",
"version": "1.3.3.0",
"opensearchDashboardsVersion": "1.3.3",
"version": "1.3.4.0",
"opensearchDashboardsVersion": "1.3.4",
"server": true,
"ui": true,
"requiredPlugins": ["navigation"],
Expand Down
2 changes: 1 addition & 1 deletion workbench/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opensearch-query-workbench",
"version": "1.3.3.0",
"version": "1.3.4.0",
"description": "Query Workbench",
"main": "index.js",
"license": "Apache-2.0",
Expand Down