From 183ff3e0573e7f71c9e317eb2f29186192eada46 Mon Sep 17 00:00:00 2001 From: penghuo Date: Fri, 5 Aug 2022 16:30:41 -0700 Subject: [PATCH] Bump version to 2.2.0 Signed-off-by: penghuo --- .github/workflows/draft-release-notes-workflow.yml | 2 +- .github/workflows/sql-odbc-release-workflow.yml | 2 +- .github/workflows/sql-workbench-release-workflow.yml | 2 +- .../workflows/sql-workbench-test-and-build-workflow.yml | 2 +- build.gradle | 2 +- core/build.gradle | 6 +++--- integ-test/build.gradle | 6 +++--- opensearch/build.gradle | 6 +++--- plugin/build.gradle | 8 ++++---- ppl/build.gradle | 4 ++-- sql-jdbc/build.gradle | 2 +- sql/build.gradle | 4 ++-- workbench/opensearch_dashboards.json | 2 +- workbench/package.json | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index 6497e94c95..b0b92441b1 100644 --- a/.github/workflows/draft-release-notes-workflow.yml +++ b/.github/workflows/draft-release-notes-workflow.yml @@ -16,6 +16,6 @@ jobs: with: config-name: draft-release-notes-config.yml tag: (None) - version: 2.1.0.0 + version: 2.2.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/sql-odbc-release-workflow.yml b/.github/workflows/sql-odbc-release-workflow.yml index 83d4f89b0c..00920fffd7 100644 --- a/.github/workflows/sql-odbc-release-workflow.yml +++ b/.github/workflows/sql-odbc-release-workflow.yml @@ -12,7 +12,7 @@ env: ODBC_BUILD_PATH: "./build/odbc/build" AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install" PLUGIN_NAME: opensearch-sql-odbc - OD_VERSION: 2.1.0.0 + OD_VERSION: 2.2.0.0 jobs: build-mac: diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml index 35a6396a85..ef23bff98a 100644 --- a/.github/workflows/sql-workbench-release-workflow.yml +++ b/.github/workflows/sql-workbench-release-workflow.yml @@ -8,7 +8,7 @@ on: env: PLUGIN_NAME: query-workbench-dashboards OPENSEARCH_VERSION: 'main' - OPENSEARCH_PLUGIN_VERSION: 2.1.0.0 + OPENSEARCH_PLUGIN_VERSION: 2.2.0.0 jobs: diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index d4c3f12996..c0ae593c1d 100644 --- 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: 'main' - OPENSEARCH_PLUGIN_VERSION: 2.1.0.0 + OPENSEARCH_PLUGIN_VERSION: 2.2.0.0 jobs: diff --git a/build.gradle b/build.gradle index 9e2c1c6b6d..28ecdc9dbe 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") version_tokens = opensearch_version.tokenize('-') diff --git a/core/build.gradle b/core/build.gradle index 3ecc7a0ef9..342d5673cd 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -40,8 +40,8 @@ repositories { dependencies { api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' - api group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' - api group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + api group: 'org.springframework', name: 'spring-context', version: '5.3.22' + api group: 'org.springframework', name: 'spring-beans', version: '5.3.22' api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10' api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240' api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1' @@ -49,7 +49,7 @@ dependencies { testImplementation('org.junit.jupiter:junit-jupiter:5.6.2') testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1' - testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.20.RELEASE' + testImplementation group: 'org.springframework', name: 'spring-test', version: '5.3.22' testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4' testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4' } diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 0baf1af6cc..864b4df097 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -53,9 +53,9 @@ 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.13.2' - resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2' - resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2' + resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.3' + resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.3' + resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.3' } dependencies { diff --git a/opensearch/build.gradle b/opensearch/build.gradle index e448933005..2b26943d5b 100644 --- a/opensearch/build.gradle +++ b/opensearch/build.gradle @@ -32,9 +32,9 @@ dependencies { api project(':core') api group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}" implementation "io.github.resilience4j:resilience4j-retry:1.5.0" - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2' - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.3' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.3' implementation group: 'org.json', name: 'json', version:'20180813' compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}" implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" diff --git a/plugin/build.gradle b/plugin/build.gradle index 8e59efcfb2..5c4d635ef0 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -82,12 +82,12 @@ configurations.all { // 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.13.2' + resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.3' // 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.13.2' - resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2' + resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.3' + resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.3' } compileJava { options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor']) @@ -98,7 +98,7 @@ compileTestJava { } dependencies { - api group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + api group: 'org.springframework', name: 'spring-beans', version: '5.3.22' api project(":ppl") api project(':legacy') api project(':opensearch') diff --git a/ppl/build.gradle b/ppl/build.gradle index c4becfa3d8..1fb4c77642 100644 --- a/ppl/build.gradle +++ b/ppl/build.gradle @@ -48,8 +48,8 @@ dependencies { implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' api group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}" api group: 'org.json', name: 'json', version: '20180813' - implementation group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' - implementation group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + implementation group: 'org.springframework', name: 'spring-context', version: '5.3.22' + implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.22' implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1' api project(':common') api project(':core') diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 0937619dc1..6af5e28c28 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -24,7 +24,7 @@ plugins { group 'org.opensearch.client' // keep version in sync with version in Driver source -version '2.1.0.0' +version '2.2.0.0' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false")); if (snapshot) { diff --git a/sql/build.gradle b/sql/build.gradle index d04e28c03d..e6d1a65a53 100644 --- a/sql/build.gradle +++ b/sql/build.gradle @@ -47,8 +47,8 @@ dependencies { implementation "org.antlr:antlr4-runtime:4.7.1" implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' implementation group: 'org.json', name: 'json', version:'20180813' - implementation group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE' - implementation group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE' + implementation group: 'org.springframework', name: 'spring-context', version: '5.3.22' + implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.22' implementation project(':common') implementation project(':core') api project(':protocol') diff --git a/workbench/opensearch_dashboards.json b/workbench/opensearch_dashboards.json index df1aa01300..1599f5e4a8 100644 --- a/workbench/opensearch_dashboards.json +++ b/workbench/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "queryWorkbenchDashboards", "version": "2.1.0.0", - "opensearchDashboardsVersion": "2.1.0", + "opensearchDashboardsVersion": "2.2.0", "server": true, "ui": true, "requiredPlugins": ["navigation"], diff --git a/workbench/package.json b/workbench/package.json index 0ba5a3ad0c..74cf2c9f41 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,6 +1,6 @@ { "name": "opensearch-query-workbench", - "version": "2.1.0.0", + "version": "2.2.0.0", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0",