Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Bump to ODFE 1.10.1.1 for integration test fixes #759

Merged
merged 3 commits into from Sep 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Expand Up @@ -16,6 +16,6 @@ jobs:
with:
config-name: draft-release-notes-config.yml
tag: (None)
version: 1.10.1.0
version: 1.10.1.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -48,7 +48,7 @@ ext {
}

allprojects {
version = "${opendistroVersion}.0"
version = "${opendistroVersion}.1"

plugins.withId('java') {
sourceCompatibility = targetCompatibility = "1.8"
Expand Down
10 changes: 8 additions & 2 deletions integ-test/build.gradle
@@ -1,4 +1,5 @@
import org.elasticsearch.gradle.test.RestIntegTestTask
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform

apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.rest-test'
Expand Down Expand Up @@ -198,6 +199,11 @@ testClusters.comparisonTest {
task compileJdbc(type:Exec) {
workingDir '../sql-jdbc/'

commandLine './gradlew', 'build'
commandLine './gradlew', 'shadowJar'
if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
commandLine './gradlew.bat', 'build'
commandLine './gradlew.bat', 'shadowJar'
} else {
commandLine './gradlew', 'build'
commandLine './gradlew', 'shadowJar'
}
}
@@ -0,0 +1,6 @@
## 2020-09-28 Version 1.10.1.1

### Infrastructure
* Support security plugin ([#760](https://github.com/opendistro-for-elasticsearch/sql/pull/760))
* Bump to ODFE 1.10.1.1 for integration test fixes ([#759](https://github.com/opendistro-for-elasticsearch/sql/pull/759))
* Bug Fix, Clean all the indices, included hidden indices ([#758](https://github.com/opendistro-for-elasticsearch/sql/pull/758))
2 changes: 1 addition & 1 deletion sql-cli/src/odfe_sql_cli/__init__.py
Expand Up @@ -12,4 +12,4 @@
express or implied. See the License for the specific language governing
permissions and limitations under the License.
"""
__version__ = "1.10.1.0"
__version__ = "1.10.1.1"
2 changes: 1 addition & 1 deletion sql-jdbc/build.gradle
Expand Up @@ -32,7 +32,7 @@ plugins {
group 'com.amazon.opendistroforelasticsearch.client'

// keep version in sync with version in Driver source
version '1.10.1.0'
version '1.10.1.1'

boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true"));
if (snapshot) {
Expand Down
Expand Up @@ -19,7 +19,7 @@
public enum Version {

// keep this in sync with the gradle version
Current(1, 10, 1, 0);
Current(1, 10, 1, 1);

private int major;
private int minor;
Expand Down
4 changes: 2 additions & 2 deletions sql-odbc/src/CMakeLists.txt
Expand Up @@ -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.10.1.0")
set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,10,1,0")
set(DRIVER_PACKAGE_VERSION "1.10.1.1")
set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,10,1,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} )
Expand Down
2 changes: 1 addition & 1 deletion sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>

<connector-plugin class='odfe_sql_odbc' superclass='odbc' plugin-version='1.10.1.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
<connector-plugin class='odfe_sql_odbc' superclass='odbc' plugin-version='1.10.1.1' name='SQL' version='18.1' min-version-tableau='2020.1'>
<vendor-information>
<company name="Open Distro for ES"/>
<support-link url="https://github.com/opendistro-for-elasticsearch/sql"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>

<connector-plugin class='odfe_sql_odbc_dev' superclass='odbc' plugin-version='1.10.1.0' name='Open Distro for Elasticsearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
<connector-plugin class='odfe_sql_odbc_dev' superclass='odbc' plugin-version='1.10.1.1' name='Open Distro for Elasticsearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
<vendor-information>
<company name="Open Distro for Elasticsearch"/>
<support-link url="https://github.com/opendistro-for-elasticsearch/sql"/>
Expand Down
2 changes: 1 addition & 1 deletion workbench/package.json
@@ -1,6 +1,6 @@
{
"name": "opendistro-query-workbench",
"version": "1.10.1.0",
"version": "1.10.1.1",
"description": "Query Workbench",
"main": "index.js",
"license": "Apache-2.0",
Expand Down