opendistro-for-elasticsearch · zhongnansu · Nov 21, 2020 · Nov 19, 2020 · Nov 19, 2020 · Nov 20, 2020
diff --git 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.11.0.0
+          version: 1.12.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sql-jdbc-release-workflow.yml b/.github/workflows/sql-jdbc-release-workflow.yml
@@ -3,13 +3,13 @@ name: Build and Release SQL-JDBC
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   Release-SQL-JDBC:
     strategy:
       matrix:
-        java: [10]
+        java: [14]
 
     name: Build and Release JDBC Plugin
     runs-on: ubuntu-latest
@@ -20,19 +20,19 @@ jobs:
     steps:
       - name: Checkout SQL-JDBC
         uses: actions/checkout@v1
-      
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
-        
+
       - name: Setup Java ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-      
+
       - name: Run build
         run: |
           ./gradlew publishShadowPublicationToInternal-releasesRepository '-Dorg.gradle.jvmargs=--add-modules java.xml.bind' -Dbuild.snapshot=false

diff --git a/.github/workflows/sql-jdbc-test-and-build-workflow.yml b/.github/workflows/sql-jdbc-test-and-build-workflow.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Set up JDK 1.13
+    - name: Set up JDK 1.14
       uses: actions/setup-java@v1
       with:
-        java-version: 1.13
+        java-version: 1.14
 
     - name: Build with Gradle
       run: ./gradlew build

diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ gen/
 # various IDE files
 .vscode
 .idea
+.history
 
 # git mergetool artifact
 *.orig

diff --git 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.11.0.0"
+__version__ = "1.12.0.0"
diff --git 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.11.0.0'
+version '1.12.0.0'
 
 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
@@ -19,7 +19,7 @@
 public enum Version {
 
     // keep this in sync with the gradle version
-    Current(1, 11, 0, 0);
+    Current(1, 12, 0, 0);
 
     private int major;
     private int minor;

diff --git 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.11.0.0")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,11,0,0")
+set(DRIVER_PACKAGE_VERSION "1.12.0.0")
+set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,12,0,0")
 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
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='odfe_sql_odbc' superclass='odbc' plugin-version='1.11.0.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
+<connector-plugin class='odfe_sql_odbc' superclass='odbc' plugin-version='1.12.0.0' 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"/>

diff --git 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 @@
 <?xml version='1.0' encoding='utf-8' ?>
 
-<connector-plugin class='odfe_sql_odbc_dev' superclass='odbc' plugin-version='1.11.0.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.12.0.0' 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"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ gen/ @@
     # various IDE files
     .vscode
     .idea
+    .history
     # git mergetool artifact
     *.orig
@@ Expand Down @@