diff --git a/.github/workflows/draft-release-notes-workflow.yml b/.github/workflows/draft-release-notes-workflow.yml index 7379fa093f..93b9773488 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.10.1.0 + version: 1.10.1.1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle b/build.gradle index 31f465f3c1..1aa2113946 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/integ-test/build.gradle b/integ-test/build.gradle index d6702b564e..07edc69156 100644 --- a/integ-test/build.gradle +++ b/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' @@ -195,6 +196,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' + } } diff --git a/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.10.1.1.md b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.10.1.1.md new file mode 100644 index 0000000000..5c02824a43 --- /dev/null +++ b/release-notes/opendistro-for-elasticsearch-sql.release-notes-1.10.1.1.md @@ -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)) diff --git a/sql-cli/src/odfe_sql_cli/__init__.py b/sql-cli/src/odfe_sql_cli/__init__.py index dba5aff78e..33d8e733e7 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.10.1.0" +__version__ = "1.10.1.1" diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 1717ae76bd..7546a02ddf 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.10.1.0' +version '1.10.1.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 f206dbf64a..3492f1bd92 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, 10, 1, 0); + Current(1, 10, 1, 1); private int major; private int minor; diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt index 22ba27fc2d..64e94ff4f6 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.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} ) diff --git a/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml b/sql-odbc/src/TableauConnector/odfe_sql_odbc/manifest.xml index 3c00e238a7..197b8d0320 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 b7f096aea4..6b38e6078b 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/sql-workbench/package.json b/sql-workbench/package.json index c220a318b0..e734947b90 100644 --- a/sql-workbench/package.json +++ b/sql-workbench/package.json @@ -1,6 +1,6 @@ { "name": "opendistro-sql-workbench", - "version": "1.10.1.0", + "version": "1.10.1.1", "description": "SQL Workbench", "main": "index.js", "license": "Apache-2.0",