diff --git a/dev/kyuubi-codecov/pom.xml b/dev/kyuubi-codecov/pom.xml index 4e3a0b81f..9a69531fa 100644 --- a/dev/kyuubi-codecov/pom.xml +++ b/dev/kyuubi-codecov/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/dev/kyuubi-tpcds/pom.xml b/dev/kyuubi-tpcds/pom.xml index ddc6a3c4a..11601bfc3 100644 --- a/dev/kyuubi-tpcds/pom.xml +++ b/dev/kyuubi-tpcds/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/dev/merge_kyuubi_pr.py b/dev/merge_kyuubi_pr.py index fe8893748..5894ebdf2 100755 --- a/dev/merge_kyuubi_pr.py +++ b/dev/merge_kyuubi_pr.py @@ -234,7 +234,9 @@ def main(): branches = get_json("%s/branches" % GITHUB_API_BASE) branch_names = list(filter(lambda x: x.startswith("branch-"), [x['name'] for x in branches])) # Assumes branch names can be sorted lexicographically - latest_branch = sorted(branch_names, reverse=True)[0] + def sort_by_version(branch_name): + return tuple(map(int, branch_name.split('-')[1].split('.'))) + latest_branch = sorted(branch_names, key=sort_by_version, reverse=True)[0] pr_num = input("Which pull request would you like to merge? (e.g. 34): ") pr = get_json("%s/pulls/%s" % (GITHUB_API_BASE, pr_num)) diff --git a/extensions/flink/kyuubi-flink-token-provider/pom.xml b/extensions/flink/kyuubi-flink-token-provider/pom.xml index 61d93682a..f7c377cce 100644 --- a/extensions/flink/kyuubi-flink-token-provider/pom.xml +++ b/extensions/flink/kyuubi-flink-token-provider/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/server/kyuubi-server-plugin/pom.xml b/extensions/server/kyuubi-server-plugin/pom.xml index 6c3790c48..22e433d7c 100644 --- a/extensions/server/kyuubi-server-plugin/pom.xml +++ b/extensions/server/kyuubi-server-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-extension-spark-3-3/pom.xml b/extensions/spark/kyuubi-extension-spark-3-3/pom.xml index de7fe9bde..b1f945d15 100644 --- a/extensions/spark/kyuubi-extension-spark-3-3/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-3-3/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-extension-spark-3-4/pom.xml b/extensions/spark/kyuubi-extension-spark-3-4/pom.xml index 37d33671e..edd9d7b08 100644 --- a/extensions/spark/kyuubi-extension-spark-3-4/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-3-4/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-extension-spark-3-5/pom.xml b/extensions/spark/kyuubi-extension-spark-3-5/pom.xml index 113a815d5..c4d7eb6e4 100644 --- a/extensions/spark/kyuubi-extension-spark-3-5/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-3-5/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-extension-spark-jdbc-dialect/pom.xml b/extensions/spark/kyuubi-extension-spark-jdbc-dialect/pom.xml index 64773fa1a..8ea8aa2d6 100644 --- a/extensions/spark/kyuubi-extension-spark-jdbc-dialect/pom.xml +++ b/extensions/spark/kyuubi-extension-spark-jdbc-dialect/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-authz-shaded/pom.xml b/extensions/spark/kyuubi-spark-authz-shaded/pom.xml index 6777ce467..f9c4adf9f 100644 --- a/extensions/spark/kyuubi-spark-authz-shaded/pom.xml +++ b/extensions/spark/kyuubi-spark-authz-shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-authz/pom.xml b/extensions/spark/kyuubi-spark-authz/pom.xml index b3970cc2c..6d072a8db 100644 --- a/extensions/spark/kyuubi-spark-authz/pom.xml +++ b/extensions/spark/kyuubi-spark-authz/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-connector-common/pom.xml b/extensions/spark/kyuubi-spark-connector-common/pom.xml index 880a29f12..a75f78bc3 100644 --- a/extensions/spark/kyuubi-spark-connector-common/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-common/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-connector-hive/pom.xml b/extensions/spark/kyuubi-spark-connector-hive/pom.xml index c80c020e8..1d0947833 100644 --- a/extensions/spark/kyuubi-spark-connector-hive/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-hive/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml b/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml index 6d27d01ee..6654483d2 100644 --- a/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-tpcds/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-connector-tpch/pom.xml b/extensions/spark/kyuubi-spark-connector-tpch/pom.xml index 458df4bdc..3fc9c8532 100644 --- a/extensions/spark/kyuubi-spark-connector-tpch/pom.xml +++ b/extensions/spark/kyuubi-spark-connector-tpch/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-jvm-quake/pom.xml b/extensions/spark/kyuubi-spark-jvm-quake/pom.xml index 32ee20afa..c634000f3 100644 --- a/extensions/spark/kyuubi-spark-jvm-quake/pom.xml +++ b/extensions/spark/kyuubi-spark-jvm-quake/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/extensions/spark/kyuubi-spark-lineage/pom.xml b/extensions/spark/kyuubi-spark-lineage/pom.xml index bddfb0fe6..7e09042da 100644 --- a/extensions/spark/kyuubi-spark-lineage/pom.xml +++ b/extensions/spark/kyuubi-spark-lineage/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../../pom.xml diff --git a/externals/kyuubi-chat-engine/pom.xml b/externals/kyuubi-chat-engine/pom.xml index b04936a32..422f36b9a 100644 --- a/externals/kyuubi-chat-engine/pom.xml +++ b/externals/kyuubi-chat-engine/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/externals/kyuubi-download/pom.xml b/externals/kyuubi-download/pom.xml index 60fbe1e5b..83cb44d12 100644 --- a/externals/kyuubi-download/pom.xml +++ b/externals/kyuubi-download/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/externals/kyuubi-flink-sql-engine/pom.xml b/externals/kyuubi-flink-sql-engine/pom.xml index 77da3baa9..7edbf0f79 100644 --- a/externals/kyuubi-flink-sql-engine/pom.xml +++ b/externals/kyuubi-flink-sql-engine/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/externals/kyuubi-hive-sql-engine/pom.xml b/externals/kyuubi-hive-sql-engine/pom.xml index ac42040d7..b0a3e265d 100644 --- a/externals/kyuubi-hive-sql-engine/pom.xml +++ b/externals/kyuubi-hive-sql-engine/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/externals/kyuubi-jdbc-engine/pom.xml b/externals/kyuubi-jdbc-engine/pom.xml index dd0bd1290..a69b55c40 100644 --- a/externals/kyuubi-jdbc-engine/pom.xml +++ b/externals/kyuubi-jdbc-engine/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml index 9dd0f9e09..08cadcc50 100644 --- a/externals/kyuubi-spark-sql-engine/pom.xml +++ b/externals/kyuubi-spark-sql-engine/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/externals/kyuubi-trino-engine/pom.xml b/externals/kyuubi-trino-engine/pom.xml index 5b0d9e3f0..c4af1c995 100644 --- a/externals/kyuubi-trino-engine/pom.xml +++ b/externals/kyuubi-trino-engine/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../../pom.xml diff --git a/integration-tests/kyuubi-flink-it/pom.xml b/integration-tests/kyuubi-flink-it/pom.xml index 01018c00c..415cefa53 100644 --- a/integration-tests/kyuubi-flink-it/pom.xml +++ b/integration-tests/kyuubi-flink-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/kyuubi-gluten-it/pom.xml b/integration-tests/kyuubi-gluten-it/pom.xml index be72e129b..80ca234aa 100644 --- a/integration-tests/kyuubi-gluten-it/pom.xml +++ b/integration-tests/kyuubi-gluten-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/kyuubi-hive-it/pom.xml b/integration-tests/kyuubi-hive-it/pom.xml index de48b1d94..c7bf3ff2a 100644 --- a/integration-tests/kyuubi-hive-it/pom.xml +++ b/integration-tests/kyuubi-hive-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/kyuubi-jdbc-it/pom.xml b/integration-tests/kyuubi-jdbc-it/pom.xml index 1279f3e8d..a63a9639a 100644 --- a/integration-tests/kyuubi-jdbc-it/pom.xml +++ b/integration-tests/kyuubi-jdbc-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/kyuubi-kubernetes-it/pom.xml b/integration-tests/kyuubi-kubernetes-it/pom.xml index 84e4b586a..095bd29a3 100644 --- a/integration-tests/kyuubi-kubernetes-it/pom.xml +++ b/integration-tests/kyuubi-kubernetes-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/kyuubi-trino-it/pom.xml b/integration-tests/kyuubi-trino-it/pom.xml index d5d479d01..47e6a91bd 100644 --- a/integration-tests/kyuubi-trino-it/pom.xml +++ b/integration-tests/kyuubi-trino-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/kyuubi-zookeeper-it/pom.xml b/integration-tests/kyuubi-zookeeper-it/pom.xml index cd1b7142b..14b87dc36 100644 --- a/integration-tests/kyuubi-zookeeper-it/pom.xml +++ b/integration-tests/kyuubi-zookeeper-it/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi integration-tests - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1c5e1be80..f02362cbc 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT integration-tests diff --git a/kyuubi-assembly/pom.xml b/kyuubi-assembly/pom.xml index 1733f12ae..f72d2a95b 100644 --- a/kyuubi-assembly/pom.xml +++ b/kyuubi-assembly/pom.xml @@ -22,7 +22,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml index 57c5a27fd..cb592948d 100644 --- a/kyuubi-common/pom.xml +++ b/kyuubi-common/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/kyuubi-ctl/pom.xml b/kyuubi-ctl/pom.xml index 2f7877f3e..38479002c 100644 --- a/kyuubi-ctl/pom.xml +++ b/kyuubi-ctl/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/kyuubi-events/pom.xml b/kyuubi-events/pom.xml index 8d2e0a542..491cfc1ed 100644 --- a/kyuubi-events/pom.xml +++ b/kyuubi-events/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/kyuubi-ha/pom.xml b/kyuubi-ha/pom.xml index 749ab0632..2ad1ed59b 100644 --- a/kyuubi-ha/pom.xml +++ b/kyuubi-ha/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT ../pom.xml diff --git a/kyuubi-hive-beeline/pom.xml b/kyuubi-hive-beeline/pom.xml index cdb45d670..dafae9509 100644 --- a/kyuubi-hive-beeline/pom.xml +++ b/kyuubi-hive-beeline/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-hive-beeline diff --git a/kyuubi-hive-jdbc-shaded/pom.xml b/kyuubi-hive-jdbc-shaded/pom.xml index 6546c6c18..9a2133491 100644 --- a/kyuubi-hive-jdbc-shaded/pom.xml +++ b/kyuubi-hive-jdbc-shaded/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-hive-jdbc-shaded diff --git a/kyuubi-hive-jdbc/pom.xml b/kyuubi-hive-jdbc/pom.xml index 6ce0d1017..798b49ac6 100644 --- a/kyuubi-hive-jdbc/pom.xml +++ b/kyuubi-hive-jdbc/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-hive-jdbc diff --git a/kyuubi-metrics/pom.xml b/kyuubi-metrics/pom.xml index 10c79464b..a8ca957bf 100644 --- a/kyuubi-metrics/pom.xml +++ b/kyuubi-metrics/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-metrics_${scala.binary.version} diff --git a/kyuubi-rest-client/pom.xml b/kyuubi-rest-client/pom.xml index 7c1be83b2..cb4dab13d 100644 --- a/kyuubi-rest-client/pom.xml +++ b/kyuubi-rest-client/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-rest-client diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml index 2b0d0d886..638dcbda6 100644 --- a/kyuubi-server/pom.xml +++ b/kyuubi-server/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-server_${scala.binary.version} diff --git a/kyuubi-server/web-ui/package-lock.json b/kyuubi-server/web-ui/package-lock.json index e5c0a9423..672165201 100644 --- a/kyuubi-server/web-ui/package-lock.json +++ b/kyuubi-server/web-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "kyuubi-ui", - "version": "1.10.0-SNAPSHOT", + "version": "1.11.0-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "kyuubi-ui", - "version": "1.10.0-SNAPSHOT", + "version": "1.11.0-SNAPSHOT", "dependencies": { "@element-plus/icons-vue": "^2.0.9", "axios": "^1.7.4", diff --git a/kyuubi-server/web-ui/package.json b/kyuubi-server/web-ui/package.json index 0a897018c..351ca1ed7 100644 --- a/kyuubi-server/web-ui/package.json +++ b/kyuubi-server/web-ui/package.json @@ -1,7 +1,7 @@ { "name": "kyuubi-ui", "private": true, - "version": "1.10.0-SNAPSHOT", + "version": "1.11.0-SNAPSHOT", "type": "module", "scripts": { "dev": "vue-tsc --noEmit && vite --port 9090", diff --git a/kyuubi-util-scala/pom.xml b/kyuubi-util-scala/pom.xml index 365c0c9d9..3a081c55a 100644 --- a/kyuubi-util-scala/pom.xml +++ b/kyuubi-util-scala/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-util-scala_${scala.binary.version} diff --git a/kyuubi-util/pom.xml b/kyuubi-util/pom.xml index fcb3498b1..50ea67397 100644 --- a/kyuubi-util/pom.xml +++ b/kyuubi-util/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-util diff --git a/kyuubi-zookeeper/pom.xml b/kyuubi-zookeeper/pom.xml index 4987adf9e..30e543a9b 100644 --- a/kyuubi-zookeeper/pom.xml +++ b/kyuubi-zookeeper/pom.xml @@ -21,7 +21,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT kyuubi-zookeeper_${scala.binary.version} diff --git a/pom.xml b/pom.xml index 18eb69ef1..0005d54c1 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.kyuubi kyuubi-parent - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT pom Kyuubi Project Parent