diff --git a/LICENSE-binary b/LICENSE-binary
index bfaee55ba41..03c30101153 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -296,7 +296,6 @@ io.netty:netty-handler
io.netty:netty-resolver-dns
io.netty:netty-resolver
io.netty:netty-transport-classes-epoll
-io.netty:netty-transport-classes-kqueue
io.netty:netty-transport-native-epoll
io.netty:netty-transport-native-unix-common
io.netty:netty-transport
diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml
index 90034933d0e..55f0e80e0d0 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -208,7 +208,12 @@
false
+ com.google.android:annotations
+ com.google.api.grpc:proto-google-common-protos
+ com.google.code.gson:gson
+ com.google.errorprone:error_prone_annotations
com.google.guava:*
+ com.google.j2objc:j2objc-annotations
com.google.protobuf:*
io.etcd:*
io.grpc:*
@@ -216,21 +221,24 @@
io.perfmark:perfmark-api
io.vertx:*
net.jodah:failsafe
- org.apache.kyuubi:kyuubi-common_${scala.binary.version}
- org.apache.kyuubi:kyuubi-events_${scala.binary.version}
- org.apache.kyuubi:kyuubi-ha_${scala.binary.version}
org.apache.curator:curator-client
org.apache.curator:curator-framework
org.apache.curator:curator-recipes
- org.apache.zookeeper:zookeeper
org.apache.hive:hive-service-rpc
+ org.apache.kyuubi:kyuubi-common_${scala.binary.version}
+ org.apache.kyuubi:kyuubi-events_${scala.binary.version}
+ org.apache.kyuubi:kyuubi-ha_${scala.binary.version}
org.apache.thrift:*
+ org.apache.zookeeper:zookeeper
+ org.checkerframework:checker-qual
+ org.codehaus.mojo:animal-sniffer-annotations
*:*
+ **/*.proto
META-INF/*.SF
META-INF/*.DSA
META-INF/*.RSA
@@ -289,12 +297,16 @@
- com.google
- ${kyuubi.shade.packageName}.com.google
+ io.etcd
+ ${kyuubi.shade.packageName}.io.etcd
- com.google.**
+ io.etcd.**
+
+ io.grpc
+ ${kyuubi.shade.packageName}.io.grpc
+
io.netty
${kyuubi.shade.packageName}.io.netty
@@ -302,6 +314,10 @@
io.netty.**
+
+ io.perfmark
+ ${kyuubi.shade.packageName}.io.perfmark
+
io.vertx
${kyuubi.shade.packageName}.io.vertx
@@ -317,12 +333,83 @@
- io.perfmark
- ${kyuubi.shade.packageName}.io.perfmark
+ android.annotation
+ ${kyuubi.shade.packageName}.android.annotation
+
+
+ com.google.common
+ ${kyuubi.shade.packageName}.com.google.common
+
+ com.google.common.**
+
+
+
+ com.google.thirdparty
+ ${kyuubi.shade.packageName}.com.google.thirdparty
- io.perfmark.**
+ com.google.thirdparty.**
+
+ com.google.protobuf
+ ${kyuubi.shade.packageName}.com.google.protobuf
+
+ com.google.protobuf.**
+
+
+
+ org.codehaus.mojo.animal_sniffer
+ ${kyuubi.shade.packageName}.org.codehaus.mojo.animal_sniffer
+
+
+ com.google.j2objc.annotations
+ ${kyuubi.shade.packageName}.com.google.j2objc.annotations
+
+
+ com.google.errorprone.annotations
+ ${kyuubi.shade.packageName}.com.google.errorprone.annotations
+
+
+ org.checkerframework
+ ${kyuubi.shade.packageName}.org.checkerframework
+
+
+ com.google.gson
+ ${kyuubi.shade.packageName}.com.google.gson
+
+
+
+ com.google.api
+ ${kyuubi.shade.packageName}.com.google.api
+
+
+ com.google.cloud
+ ${kyuubi.shade.packageName}.com.google.cloud
+
+
+ com.google.geo
+ ${kyuubi.shade.packageName}.com.google.geo
+
+
+ com.google.logging
+ ${kyuubi.shade.packageName}.com.google.logging
+
+
+ com.google.longrunning
+ ${kyuubi.shade.packageName}.com.google.longrunning
+
+
+ com.google.rpc
+ ${kyuubi.shade.packageName}.com.google.rpc
+
+
+ com.google.type
+ ${kyuubi.shade.packageName}.com.google.type
+
@@ -338,6 +425,40 @@
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ rename-native-library
+ package
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
org.apache.maven.plugins
maven-jar-plugin
diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/LICENSE b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/LICENSE
index a37b034dc89..fc5e57e6b19 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/LICENSE
+++ b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/LICENSE
@@ -210,31 +210,54 @@ Apache License Version 2.0
org.apache.curator:curator-client
org.apache.curator:curator-framework
org.apache.curator:curator-recipes
-net.jodah:failsafe
-io.grpc:grpc-core
-io.grpc:grpc-protobuf
+org.apache.hive:hive-service-rpc
+org.apache.thrift:libfb303
+org.apache.thrift:libthrift
+org.apache.zookeeper:zookeeper
+com.google.api.grpc:proto-google-common-protos
+com.google.android:annotations
+com.google.code.gson:gson
+com.google.errorprone:error_prone_annotations
+com.google.guava:guava
+com.google.guava:failureaccess
+com.google.j2objc:j2objc-annotations
+io.etcd:jetcd-api
+io.etcd:jetcd-common
+io.etcd:jetcd-core
+io.etcd:jetcd-grpc
io.grpc:grpc-api
io.grpc:grpc-context
+io.grpc:grpc-core
io.grpc:grpc-grpclb
io.grpc:grpc-netty
+io.grpc:grpc-protobuf
io.grpc:grpc-protobuf-lite
io.grpc:grpc-stub
-com.google.guava:guava
-io.etcd:jetcd-api
-io.etcd:jetcd-common
-io.etcd:jetcd-core
-io.etcd:jetcd-grpc
+io.netty:netty-buffer
+io.netty:netty-codec
io.netty:netty-codec-dns
io.netty:netty-codec-http
io.netty:netty-codec-http2
io.netty:netty-codec-socks
+io.netty:netty-common
+io.netty:netty-handler
io.netty:netty-handler-proxy
+io.netty:netty-resolver
io.netty:netty-resolver-dns
+io.netty:netty-transport
+io.netty:netty-transport-classes-epoll
+io.netty:netty-transport-native-epoll
+io.netty:netty-transport-native-unix-common
io.perfmark:perfmark-api
-io.vertx:vertx-core
io.vertx:vertx-grpc
+io.vertx:vertx-core
+net.jodah:failsafe
BSD License
--------------------------
-com.google.protobuf:protobuf-java-util
com.google.protobuf:protobuf-java
+com.google.protobuf:protobuf-java-util
+
+MIT license
+--------------------------
+org.codehaus.mojo:animal-sniffer-annotations
diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE
index b80c1b166bf..da91fb4fb6e 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE
+++ b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE
@@ -23,269 +23,5 @@ Copyright 2019 The Apache Software Foundation
Apache Thrift
Copyright 2006-2010 The Apache Software Foundation.
-Google Guava Version 18.0
-* Copyright (C) 2009 The Guava Authors
-
- The Netty Project
- =================
-
-Please visit the Netty web site for more information:
-
- * https://netty.io/
-
-Copyright 2014 The Netty Project
-
-The Netty Project licenses this file to you under the Apache License,
-version 2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at:
-
- https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
-
-Also, please refer to each LICENSE..txt file, which is located in
-the 'license' directory of the distribution file, for the license terms of the
-components that this product depends on.
-
--------------------------------------------------------------------------------
-This product contains the extensions to Java Collections Framework which has
-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:
-
- * LICENSE:
- * license/LICENSE.jsr166y.txt (Public Domain)
- * HOMEPAGE:
- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/
- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/
-
-This product contains a modified version of Robert Harder's Public Domain
-Base64 Encoder and Decoder, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.base64.txt (Public Domain)
- * HOMEPAGE:
- * http://iharder.sourceforge.net/current/java/base64/
-
-This product contains a modified portion of 'Webbit', an event based
-WebSocket and HTTP server, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.webbit.txt (BSD License)
- * HOMEPAGE:
- * https://github.com/joewalnes/webbit
-
-This product contains a modified portion of 'SLF4J', a simple logging
-facade for Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.slf4j.txt (MIT License)
- * HOMEPAGE:
- * https://www.slf4j.org/
-
-This product contains a modified portion of 'Apache Harmony', an open source
-Java SE, which can be obtained at:
-
- * NOTICE:
- * license/NOTICE.harmony.txt
- * LICENSE:
- * license/LICENSE.harmony.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://archive.apache.org/dist/harmony/
-
-This product contains a modified portion of 'jbzip2', a Java bzip2 compression
-and decompression library written by Matthew J. Francis. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jbzip2.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jbzip2/
-
-This product contains a modified portion of 'libdivsufsort', a C API library to construct
-the suffix array and the Burrows-Wheeler transformed string for any input string of
-a constant-size alphabet written by Yuta Mori. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.libdivsufsort.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/y-256/libdivsufsort
-
-This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,
- which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jctools.txt (ASL2 License)
- * HOMEPAGE:
- * https://github.com/JCTools/JCTools
-
-This product optionally depends on 'JZlib', a re-implementation of zlib in
-pure Java, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jzlib.txt (BSD style License)
- * HOMEPAGE:
- * http://www.jcraft.com/jzlib/
-
-This product optionally depends on 'Compress-LZF', a Java library for encoding and
-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.compress-lzf.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/ning/compress
-
-This product optionally depends on 'lz4', a LZ4 Java compression
-and decompression library written by Adrien Grand. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.lz4.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jpountz/lz4-java
-
-This product optionally depends on 'lzma-java', a LZMA Java compression
-and decompression library, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.lzma-java.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jponge/lzma-java
-
-This product optionally depends on 'zstd-jni', a zstd-jni Java compression
-and decompression library, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.zstd-jni.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/luben/zstd-jni
-
-This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression
-and decompression library written by William Kinney. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jfastlz.txt (MIT License)
- * HOMEPAGE:
- * https://code.google.com/p/jfastlz/
-
-This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data
-interchange format, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.protobuf.txt (New BSD License)
- * HOMEPAGE:
- * https://github.com/google/protobuf
-
-This product optionally depends on 'Bouncy Castle Crypto APIs' to generate
-a temporary self-signed X.509 certificate when the JVM does not provide the
-equivalent functionality. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.bouncycastle.txt (MIT License)
- * HOMEPAGE:
- * https://www.bouncycastle.org/
-
-This product optionally depends on 'Snappy', a compression library produced
-by Google Inc, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.snappy.txt (New BSD License)
- * HOMEPAGE:
- * https://github.com/google/snappy
-
-This product optionally depends on 'JBoss Marshalling', an alternative Java
-serialization API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.jboss-marshalling.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/jboss-remoting/jboss-marshalling
-
-This product optionally depends on 'Caliper', Google's micro-
-benchmarking framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.caliper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/google/caliper
-
-This product optionally depends on 'Apache Commons Logging', a logging
-framework, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-logging.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://commons.apache.org/logging/
-
-This product optionally depends on 'Apache Log4J', a logging framework, which
-can be obtained at:
-
- * LICENSE:
- * license/LICENSE.log4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://logging.apache.org/log4j/
-
-This product optionally depends on 'Aalto XML', an ultra-high performance
-non-blocking XML processor, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.aalto-xml.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://wiki.fasterxml.com/AaltoHome
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.hpack.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/twitter/hpack
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Cory Benfield. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.hyper-hpack.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/python-hyper/hpack/
-
-This product contains a modified version of 'HPACK', a Java implementation of
-the HTTP/2 HPACK algorithm written by Tatsuhiro Tsujikawa. It can be obtained at:
-
- * LICENSE:
- * license/LICENSE.nghttp2-hpack.txt (MIT License)
- * HOMEPAGE:
- * https://github.com/nghttp2/nghttp2/
-
-This product contains a modified portion of 'Apache Commons Lang', a Java library
-provides utilities for the java.lang API, which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.commons-lang.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://commons.apache.org/proper/commons-lang/
-
-
-This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.
-
- * LICENSE:
- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/takari/maven-wrapper
-
-This product contains the dnsinfo.h header file, that provides a way to retrieve the system DNS configuration on MacOS.
-This private header is also used by Apple's open source
- mDNSResponder (https://opensource.apple.com/tarballs/mDNSResponder/).
-
- * LICENSE:
- * license/LICENSE.dnsinfo.txt (Apple Public Source License 2.0)
- * HOMEPAGE:
- * https://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
-
-This product optionally depends on 'Brotli4j', Brotli compression and
-decompression for Java., which can be obtained at:
-
- * LICENSE:
- * license/LICENSE.brotli4j.txt (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/hyperxpro/Brotli4j
+Netty
+Copyright 2016 The Netty Project
diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/org.apache.spark.status.AppHistoryServerPlugin b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/org.apache.spark.status.AppHistoryServerPlugin
index 2be4ed7e40f..2450f7ba17e 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/org.apache.spark.status.AppHistoryServerPlugin
+++ b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/services/org.apache.spark.status.AppHistoryServerPlugin
@@ -1 +1,18 @@
-org.apache.spark.ui.KyuubiHistoryServerPlugin
\ No newline at end of file
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.apache.spark.ui.KyuubiHistoryServerPlugin
diff --git a/kyuubi-ha/pom.xml b/kyuubi-ha/pom.xml
index 3bee828038a..942fedaf60f 100644
--- a/kyuubi-ha/pom.xml
+++ b/kyuubi-ha/pom.xml
@@ -79,6 +79,18 @@
grpc-netty
+
+ io.netty
+ netty-transport-native-epoll
+ linux-aarch_64
+
+
+
+ io.netty
+ netty-transport-native-epoll
+ linux-x86_64
+
+
io.grpc
grpc-protobuf
diff --git a/pom.xml b/pom.xml
index 428f15fed60..984d016d2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,6 +159,7 @@
4.1.84.Final
1.10.1
0.16.0
+ 3.21.1
0.10.7
2.3.0
3.2.9.0
@@ -1013,33 +1014,33 @@
io.netty
- netty-transport-classes-epoll
+ netty-transport
${netty.version}
io.netty
- netty-transport-native-epoll
+ netty-transport-classes-epoll
${netty.version}
- linux-aarch_64
io.netty
netty-transport-native-epoll
${netty.version}
- linux-x86_64
+ linux-aarch_64
io.netty
- netty-transport-native-unix-common
+ netty-transport-native-epoll
${netty.version}
+ linux-x86_64
io.netty
- netty-transport
+ netty-transport-native-unix-common
${netty.version}
@@ -1195,6 +1196,18 @@
${grpc.version}
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf.version}
+
+
+
+ com.google.protobuf
+ protobuf-java-util
+ ${protobuf.version}
+
+
net.jodah
failsafe