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

Jump to bottom

Bump version to 2.2.0 #729

Merged
merged 1 commit into from
Aug 5, 2022
Merged

Bump version to 2.2.0 #729

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
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/sql-odbc-release-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sql-workbench-release-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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: 'main'
OPENSEARCH_PLUGIN_VERSION: 2.1.0.0
OPENSEARCH_PLUGIN_VERSION: 2.2.0.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", "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('-')
Expand Down
6 changes: 3 additions & 3 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ 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'
api project(':common')

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'
}
Expand Down
6 changes: 3 additions & 3 deletions integ-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions opensearch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
8 changes: 4 additions & 4 deletions plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand All @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions ppl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion sql-jdbc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions sql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion 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": "2.1.0.0",
"opensearchDashboardsVersion": "2.1.0",
"opensearchDashboardsVersion": "2.2.0",
"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": "2.1.0.0",
"version": "2.2.0.0",
"description": "Query Workbench",
"main": "index.js",
"license": "Apache-2.0",
Expand Down