Skip to content

Commit df32384

Browse files
penghuopenghuo
authored
Bump version to 2.2.0 (#729)
Signed-off-by: penghuo <[email protected]>
1 parent 8f1b31d commit df32384

14 files changed

+25
-25
lines changed

‎.github/workflows/draft-release-notes-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
with:
1717
config-name: draft-release-notes-config.yml
1818
tag: (None)
19-
version: 2.1.0.0
19+
version: 2.2.0.0
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/sql-odbc-release-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
ODBC_BUILD_PATH: "./build/odbc/build"
1313
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
1414
PLUGIN_NAME: opensearch-sql-odbc
15-
OD_VERSION: 2.1.0.0
15+
OD_VERSION: 2.2.0.0
1616

1717
jobs:
1818
build-mac:

‎.github/workflows/sql-workbench-release-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
env:
99
PLUGIN_NAME: query-workbench-dashboards
1010
OPENSEARCH_VERSION: 'main'
11-
OPENSEARCH_PLUGIN_VERSION: 2.1.0.0
11+
OPENSEARCH_PLUGIN_VERSION: 2.2.0.0
1212

1313
jobs:
1414

‎.github/workflows/sql-workbench-test-and-build-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [pull_request, push]
55
env:
66
PLUGIN_NAME: query-workbench-dashboards
77
OPENSEARCH_VERSION: 'main'
8-
OPENSEARCH_PLUGIN_VERSION: 2.1.0.0
8+
OPENSEARCH_PLUGIN_VERSION: 2.2.0.0
99

1010
jobs:
1111

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
buildscript {
88
ext {
9-
opensearch_version = System.getProperty("opensearch.version", "2.1.0-SNAPSHOT")
9+
opensearch_version = System.getProperty("opensearch.version", "2.2.0-SNAPSHOT")
1010
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
1111
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
1212
version_tokens = opensearch_version.tokenize('-')

‎core/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ repositories {
4040

4141
dependencies {
4242
api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
43-
api group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE'
44-
api group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
43+
api group: 'org.springframework', name: 'spring-context', version: '5.3.22'
44+
api group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
4545
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
4646
api group: 'com.facebook.presto', name: 'presto-matching', version: '0.240'
4747
api group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
4848
api project(':common')
4949

5050
testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
5151
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: '2.1'
52-
testImplementation group: 'org.springframework', name: 'spring-test', version: '5.2.20.RELEASE'
52+
testImplementation group: 'org.springframework', name: 'spring-test', version: '5.3.22'
5353
testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
5454
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
5555
}

‎integ-test/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ configurations.all {
5353
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
5454
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
5555
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
56-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.2'
57-
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2'
58-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
56+
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.3'
57+
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.3'
58+
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
5959
}
6060

6161
dependencies {

‎opensearch/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ dependencies {
3232
api project(':core')
3333
api group: 'org.opensearch', name: 'opensearch', version: "${opensearch_version}"
3434
implementation "io.github.resilience4j:resilience4j-retry:1.5.0"
35-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2'
36-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
37-
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.2'
35+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.3'
36+
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.3'
37+
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-cbor', version: '2.13.3'
3838
implementation group: 'org.json', name: 'json', version:'20180813'
3939
compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
4040
implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}"

‎plugin/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,12 @@ configurations.all {
8282
// conflict with spring-jcl
8383
exclude group: "commons-logging", module: "commons-logging"
8484
// enforce 2.12.6, https://github.com/opensearch-project/sql/issues/424
85-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.2'
85+
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.13.3'
8686
// enforce 1.1.3, https://www.whitesourcesoftware.com/vulnerability-database/WS-2019-0379
8787
resolutionStrategy.force 'commons-codec:commons-codec:1.13'
8888
resolutionStrategy.force 'com.google.guava:guava:31.0.1-jre'
89-
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.2'
90-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.2.2'
89+
resolutionStrategy.force 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.13.3'
90+
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
9191
}
9292
compileJava {
9393
options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])
@@ -98,7 +98,7 @@ compileTestJava {
9898
}
9999

100100
dependencies {
101-
api group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
101+
api group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
102102
api project(":ppl")
103103
api project(':legacy')
104104
api project(':opensearch')

‎ppl/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ dependencies {
4848
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
4949
api group: 'org.opensearch', name: 'opensearch-x-content', version: "${opensearch_version}"
5050
api group: 'org.json', name: 'json', version: '20180813'
51-
implementation group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE'
52-
implementation group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
51+
implementation group: 'org.springframework', name: 'spring-context', version: '5.3.22'
52+
implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
5353
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
5454
api project(':common')
5555
api project(':core')

‎sql-jdbc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
group 'org.opensearch.client'
2525

2626
// keep version in sync with version in Driver source
27-
version '2.1.0.0'
27+
version '2.2.0.0'
2828

2929
boolean snapshot = "true".equals(System.getProperty("build.snapshot", "false"));
3030
if (snapshot) {

‎sql/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ dependencies {
4747
implementation "org.antlr:antlr4-runtime:4.7.1"
4848
implementation group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
4949
implementation group: 'org.json', name: 'json', version:'20180813'
50-
implementation group: 'org.springframework', name: 'spring-context', version: '5.2.20.RELEASE'
51-
implementation group: 'org.springframework', name: 'spring-beans', version: '5.2.20.RELEASE'
50+
implementation group: 'org.springframework', name: 'spring-context', version: '5.3.22'
51+
implementation group: 'org.springframework', name: 'spring-beans', version: '5.3.22'
5252
implementation project(':common')
5353
implementation project(':core')
5454
api project(':protocol')

‎workbench/opensearch_dashboards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "queryWorkbenchDashboards",
33
"version": "2.1.0.0",
4-
"opensearchDashboardsVersion": "2.1.0",
4+
"opensearchDashboardsVersion": "2.2.0",
55
"server": true,
66
"ui": true,
77
"requiredPlugins": ["navigation"],

‎workbench/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "opensearch-query-workbench",
3-
"version": "2.1.0.0",
3+
"version": "2.2.0.0",
44
"description": "Query Workbench",
55
"main": "index.js",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)