Incremented version to 1.3.4. (#681)

* Incremented version to 1.3.4. Signed-off-by: Zelin Hao <[email protected]> * bump jackson to 2.13.2 Signed-off-by: Joshua Li <[email protected]> Co-authored-by: Joshua Li <[email protected]>
opensearch-project · Jul 13, 2022 · f24de26 · f24de26
1 parent 0b5fa2b
commit f24de26
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml
@@ -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:

diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml
@@ -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:
 

diff --git a/build.gradle b/build.gradle
@@ -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 {

diff --git a/doctest/build.gradle b/doctest/build.gradle
@@ -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 {

diff --git a/integ-test/build.gradle b/integ-test/build.gradle
@@ -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 {

diff --git a/opensearch/build.gradle b/opensearch/build.gradle
@@ -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'

diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -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 {

diff --git a/protocol/build.gradle b/protocol/build.gradle
@@ -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')

diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json
@@ -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"],

diff --git a/workbench/package.json b/workbench/package.json
@@ -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",
-Original file 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 @@