Opendistro Release 1.6.1 (#75)

* Opendistro Release 1.6.1 * Remove CI and change release workflow based on tags
amazon-archives · May 4, 2020 · 5044d64 · 5044d64
1 parent 51fe28e
commit 5044d64
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 33 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
diff --git a/.github/workflows/CD.yml → .github/workflows/release-workflow.yml b/.github/workflows/CD.yml → .github/workflows/release-workflow.yml
@@ -1,8 +1,9 @@
 name: Build and Release SQL-JDBC
+# This workflow is triggered on creating tags to master or an opendistro release branch
 on:
   push:
-    branches:
-      - opendistro-*
+    tags:
+      - 'v*'
 
 jobs:
   Release-SQL-JDBC:

diff --git a/.github/workflows/gradle.yml → ...hub/workflows/test-and-build-workflow.yml b/.github/workflows/gradle.yml → ...hub/workflows/test-and-build-workflow.yml
diff --git a/build.gradle b/build.gradle
@@ -32,7 +32,7 @@ plugins {
 group 'com.amazon.opendistroforelasticsearch.client'
 
 // keep version in sync with version in Driver source
-version '1.6.0.0'
+version '1.6.1.0'
 
 version = "${version}"
 

diff --git a/opendistro-elasticsearch-jdbc.release-notes.md b/opendistro-elasticsearch-jdbc.release-notes.md
@@ -1,4 +1,8 @@
-## 2020-03-24, Version 1.6.0.0 (Current)
+## 2020-04-29, Version 1.6.1.0 (Current)
+### Enhancement
+* Enhancement [#72](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/72): Use default holdability for prepareStatement. (issue: [#63](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/63))
+
+## 2020-03-24, Version 1.6.0.0
 ### Enhancement
 * Enhancement [#49](https://github.com/opendistro-for-elasticsearch/sql-jdbc/pull/49): Implementation of the execute method in the PreparedStatementImpl class (issue: [#62](https://github.com/opendistro-for-elasticsearch/sql-jdbc/issues/62))
 

diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java b/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, 6, 0, 0);
+    Current(1, 6, 1, 0);
 
     private int major;
     private int minor;