diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index f4a4107cab..1990c2e82b 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: 1.13.0.0 + version: 1.13.2.1 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 fb0026b46f..24c0893d13 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: opendistro-sql-odbc - OD_VERSION: 1.13.0.0 + OD_VERSION: 1.13.2.1 jobs: build-mac: diff --git a/.github/workflows/sql-odbc-rename-and-release-workflow.yml b/.github/workflows/sql-odbc-rename-and-release-workflow.yml index 1ce207491c..93da495cb7 100644 --- a/.github/workflows/sql-odbc-rename-and-release-workflow.yml +++ b/.github/workflows/sql-odbc-rename-and-release-workflow.yml @@ -8,7 +8,7 @@ on: - rename* env: - OD_VERSION: 1.13.0.0 + OD_VERSION: 1.13.2.1 jobs: upload-odbc: diff --git a/.github/workflows/sql-workbench-release-workflow.yml b/.github/workflows/sql-workbench-release-workflow.yml index 820054f1a9..5cd6bbaac1 100644 --- a/.github/workflows/sql-workbench-release-workflow.yml +++ b/.github/workflows/sql-workbench-release-workflow.yml @@ -7,7 +7,7 @@ on: env: PLUGIN_NAME: opendistroQueryWorkbenchKibana - OD_VERSION: 1.13.2.0 + OD_VERSION: 1.13.2.1 jobs: diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index 8969cfa6ca..20b300257e 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -4,7 +4,7 @@ on: [pull_request, push] env: PLUGIN_NAME: opendistroQueryWorkbenchKibana - OD_VERSION: 1.13.2.0 + OD_VERSION: 1.13.2.1 jobs: diff --git a/build.gradle b/build.gradle index d0245d2e27..f3802ec91d 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ ext { } allprojects { - version = "${opendistroVersion}.0" + version = "${opendistroVersion}.1" plugins.withId('java') { sourceCompatibility = targetCompatibility = "1.8" diff --git a/sql-cli/src/odfe_sql_cli/__init__.py b/sql-cli/src/odfe_sql_cli/__init__.py index ca01a01f23..b3b115d110 100644 --- a/sql-cli/src/odfe_sql_cli/__init__.py +++ b/sql-cli/src/odfe_sql_cli/__init__.py @@ -12,4 +12,4 @@ express or implied. See the License for the specific language governing permissions and limitations under the License. """ -__version__ = "1.13.0.0" +__version__ = "1.13.2.1" diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 7c829053d0..9afe13b74d 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -32,7 +32,7 @@ plugins { group 'com.amazon.opendistroforelasticsearch.client' // keep version in sync with version in Driver source -version '1.13.0.0' +version '1.13.2.1' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true")); if (snapshot) { diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java index 31fe878a27..11902ee575 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java @@ -19,7 +19,7 @@ public enum Version { // keep this in sync with the gradle version - Current(1, 13, 0, 0); + Current(1, 13, 2, 1); private int major; private int minor; diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 97f7fde5d2..6334367bc5 100644 --- a/sql-odbc/src/CMakeLists.txt +++ b/sql-odbc/src/CMakeLists.txt @@ -78,8 +78,8 @@ set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer") set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller") # ODBC Driver version -set(DRIVER_PACKAGE_VERSION "1.13.0.0") -set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,13,0,0") +set(DRIVER_PACKAGE_VERSION "1.13.2.1") +set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,13,2,1") add_compile_definitions( ES_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}" # Comma separated version is required for odbc administrator's driver file. ES_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} ) diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml b/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml index 0493b5c286..b48ebfbebd 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml +++ b/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml @@ -1,6 +1,6 @@ - + diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml b/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml index 8ba3c4a33a..5c0093fab5 100644 --- a/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml +++ b/sql-odbc/src/TableauConnector/odfe_sql_odbc_dev/manifest.xml @@ -1,6 +1,6 @@ - + diff --git a/workbench/kibana.json b/workbench/kibana.json index 4b8867030c..6cbed8ee75 100644 --- a/workbench/kibana.json +++ b/workbench/kibana.json @@ -1,6 +1,6 @@ { "id": "opendistroQueryWorkbenchKibana", - "version": "1.13.0.0", + "version": "1.13.2.1", "kibanaVersion": "7.10.2", "server": true, "ui": true, diff --git a/workbench/package.json b/workbench/package.json index 182b5303ed..c9dd041bf0 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -1,6 +1,6 @@ { "name": "opendistro-query-workbench", - "version": "1.13.2.0", + "version": "1.13.2.1", "description": "Query Workbench", "main": "index.js", "license": "Apache-2.0",