This is an automated email from the ASF dual-hosted git repository.
dengzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 3490488d12c HIVE-28315: Missing classes while using hive jdbc
standalone jar (#5313) (Zhihua Deng, reviewed by Denys Kuzmenko)
3490488d12c is described below
commit 3490488d12c6af2e6b74415ef6569d646737852f
Author: dengzh <[email protected]>
AuthorDate: Sat Jul 20 09:12:34 2024 +0800
HIVE-28315: Missing classes while using hive jdbc standalone jar (#5313)
(Zhihua Deng, reviewed by Denys Kuzmenko)
---
jdbc/pom.xml | 104 ++++++++++++++++++---
.../apache/hive/jdbc/saml/IJdbcBrowserClient.java | 2 -
llap-ext-client/pom.xml | 5 -
3 files changed, 89 insertions(+), 22 deletions(-)
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 100783f9240..96fdc3e87c0 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -34,11 +34,23 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-llap-client</artifactId>
+ <artifactId>hive-standalone-metastore-common</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
@@ -46,15 +58,49 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-hplsql</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
<exclusion>
- <groupId>org.pac4j</groupId>
+ <groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-llap-client</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-storage-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
@@ -189,17 +235,23 @@
<include>org/apache/hadoop/security/*</include>
<include>org/apache/hadoop/conf/*</include>
<include>org/apache/hadoop/fs/*</include>
- <include>org/apache/hadoop/metrics2/*</include>
- <include>org/apache/hadoop/metrics2/lib/*</include>
- <include>org/apache/hadoop/metrics2/impl/*</include>
-
<include>org/apache/hadoop/util/ReflectionUtils.class</include>
-
<include>org/apache/hadoop/util/ReflectionUtils$1.class</include>
- <include>org/apache/hadoop/io/Writable.class</include>
-
<include>org/apache/hadoop/io/DataOutputBuffer.class</include>
-
<include>org/apache/hadoop/io/DataInputBuffer.class</include>
+ <include>org/apache/hadoop/fs/impl/*</include>
+ <include>org/apache/hadoop/fs/statistics/*</include>
+ <include>org/apache/hadoop/metrics2/**</include>
+ <include>org/apache/hadoop/security/token/**</include>
+ <include>org/apache/hadoop/util/*</include>
+ <include>org/apache/hadoop/net/*</include>
+ <include>org/apache/hadoop/io/*</include>
<include>org/apache/hadoop/HadoopIllegalArgumentException.class</include>
</includes>
</filter>
+ <filter>
+ <artifact>org.apache.hadoop:hadoop-auth</artifact>
+ <includes>
+
<include>org/apache/hadoop/util/PlatformName.class</include>
+
<include>org/apache/hadoop/security/authentication/util/*</include>
+ </includes>
+ </filter>
<filter>
<artifact>org.apache.hadoop:hadoop-yarn-registry</artifact>
<includes>
@@ -240,8 +292,10 @@
<exclude>aopalliance:*</exclude>
<exclude>asm:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
- <exclude>com.fasterxml.jackson.core:*</exclude>
+ <exclude>com.cedarsoftware:*</exclude>
+ <exclude>com.fasterxml.jackson.*:*</exclude>
<exclude>com.google.code.gson:*</exclude>
+ <exclude>com.google.re2j:*</exclude>
<exclude>com.google.inject:*</exclude>
<exclude>com.google.inject.extensions:*</exclude>
<exclude>com.jamesmurty.utils:*</exclude>
@@ -258,7 +312,11 @@
<exclude>commons-pool:*</exclude>
<exclude>com.google.code.findbugs:*</exclude>
<exclude>com.google.protobuf:*</exclude>
+ <exclude>com.github.pjfanning:*</exclude>
<exclude>com.microsoft.sqlserver:mssql-jdbc</exclude>
+ <exclude>com.nimbusds:*</exclude>
+ <exclude>com.squareup.okhttp3:*</exclude>
+ <exclude>com.squareup.okio:*</exclude>
<exclude>com.sun.jersey:*</exclude>
<exclude>com.sun.jersey.contribs:*</exclude>
<exclude>com.sun.xml.bind:*</exclude>
@@ -266,6 +324,8 @@
<exclude>com.thoughtworks.paranamer:*</exclude>
<exclude>com.twitter:*</exclude>
<exclude>com.zaxxer:*</exclude>
+ <exclude>de.ruedigermoeller:*</exclude>
+ <exclude>dnsjava:*</exclude>
<exclude>io.airlift:*</exclude>
<exclude>io.dropwizard.metrics:*</exclude>
<exclude>io.netty:*</exclude>
@@ -277,7 +337,7 @@
<exclude>javax.servlet:*</exclude>
<exclude>javax.servlet.jsp:*</exclude>
<exclude>javax.transaction:*</exclude>
- <exclude>javax.xml.*:*</exclude>
+ <exclude>javax.xml.bind:*</exclude>
<exclude>jline:*</exclude>
<exclude>joda-time:*</exclude>
<exclude>junit:*</exclude>
@@ -308,21 +368,27 @@
<exclude>org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice</exclude>
<exclude>org.apache.hadoop:hadoop-yarn-server-web-proxy</exclude>
<exclude>org.apache.hadoop:hadoop-annotations</exclude>
- <exclude>org.apache.hadoop:hadoop-auth</exclude>
+
<exclude>org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7</exclude>
<exclude>org.apache.hbase*:*</exclude>
<exclude>org.apache.hive:hive-vector-code-gen</exclude>
<exclude>org.apache.htrace:*</exclude>
+ <exclude>org.apache.kerby:*</exclude>
<exclude>org.apache.logging.log4j:*</exclude>
<exclude>org.apache.orc:*</exclude>
<exclude>org.apache.velocity:*</exclude>
+ <exclude>org.bouncycastle:*</exclude>
+ <exclude>org.objenesis:objenesis</exclude>
<exclude>org.codehaus.jackson:*</exclude>
<exclude>org.codehaus.jettison:*</exclude>
<exclude>org.datanucleus:*</exclude>
+ <exclude>org.eclipse.jetty:*</exclude>
<exclude>org.eclipse.jetty.aggregate:*</exclude>
+ <exclude>org.ehcache:*</exclude>
<exclude>org.fusesource.leveldbjni:*</exclude>
<exclude>org.glassfish.jersey*:*</exclude>
<exclude>org.hamcrest:*</exclude>
<exclude>org.htrace:*</exclude>
+ <exclude>org.jetbrains.kotlin:*</exclude>
<exclude>org.ow2.asm:*</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.slf4j:slf4j-reload4j</exclude>
@@ -379,6 +445,14 @@
<pattern>javolution</pattern>
<shadedPattern>org.apache.hive.javolution</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.ctc.wstx</pattern>
+
<shadedPattern>org.apache.hive.com.ctc.wstx</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.codehaus.stax2</pattern>
+
<shadedPattern>org.apache.hive.org.codehaus.stax2</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
diff --git a/jdbc/src/java/org/apache/hive/jdbc/saml/IJdbcBrowserClient.java
b/jdbc/src/java/org/apache/hive/jdbc/saml/IJdbcBrowserClient.java
index c1d7b9f9ba1..50b2bee04e2 100644
--- a/jdbc/src/java/org/apache/hive/jdbc/saml/IJdbcBrowserClient.java
+++ b/jdbc/src/java/org/apache/hive/jdbc/saml/IJdbcBrowserClient.java
@@ -19,7 +19,6 @@
package org.apache.hive.jdbc.saml;
import com.google.common.base.Preconditions;
-import com.google.errorprone.annotations.Immutable;
import java.io.Closeable;
import java.net.URI;
import org.apache.hive.service.auth.saml.HiveSamlUtils;
@@ -106,7 +105,6 @@ public interface IJdbcBrowserClient extends Closeable {
/**
* Util class which can be used to parse the response received from the
server.
*/
- @Immutable
class HiveJdbcBrowserServerResponse {
private final String msg;
private final boolean status;
diff --git a/llap-ext-client/pom.xml b/llap-ext-client/pom.xml
index ffc2c695fc6..ac7a403b7c8 100644
--- a/llap-ext-client/pom.xml
+++ b/llap-ext-client/pom.xml
@@ -29,11 +29,6 @@
<dependencies>
<!-- dependencies are always listed in sorted order by groupId, artifactId
-->
<!-- intra-project -->
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>