This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch doris-for-zhongjin
in repository https://gitbox.apache.org/repos/asf/doris.git
commit d37183c85dcd15d9607efc8240b43d4e9de5b2f1
Author: Calvin Kirs <acm_ch...@yeah.net>
AuthorDate: Wed Apr 5 16:55:53 2023 +0800
[zhongjin](dependency)Rename the Hive and Hadoop partial classes in Tdbs to
resolve class conflicts (#1582)
---
fe/fe-core/pom.xml | 80 ++++---------------------------
fe/hive-udf/pom.xml | 28 +----------
fe/java-udf/pom.xml | 13 +++--
fe/pom.xml | 131 ++++-----------------------------------------------
fe/spark-dpp/pom.xml | 5 +-
5 files changed, 30 insertions(+), 227 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index a0b6e6db9d..8a70a8b3a8 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -94,13 +94,6 @@ under the License.
<type>pom</type>
<scope>import</scope>
</dependency>
- <!-- hadoop -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client</artifactId>
- <version>${tbds.hadoop.version}</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -481,6 +474,11 @@ under the License.
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>9.4.50.v20221201</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -548,51 +546,8 @@ under the License.
<artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>netty-all</artifactId>
- <groupId>io.netty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <classifier>core</classifier>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>commons-httpclient</artifactId>
- <groupId>commons-httpclient</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-core</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-druid</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>calcite-linq4j</artifactId>
- <groupId>org.apache.calcite</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avatica</artifactId>
- <groupId>org.apache.calcite.avatica</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hive-shade</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -606,25 +561,8 @@ under the License.
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-hdfs
-->
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>netty-all</artifactId>
- <groupId>io.netty</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-auth</artifactId>
- <version>${tbds.hadoop.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hadoop-shade</artifactId>
</dependency>
<!--
https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-api -->
<dependency>
diff --git a/fe/hive-udf/pom.xml b/fe/hive-udf/pom.xml
index b80f9421fa..b971da9bb3 100644
--- a/fe/hive-udf/pom.xml
+++ b/fe/hive-udf/pom.xml
@@ -36,32 +36,8 @@ under the License.
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <classifier>core</classifier>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>commons-httpclient</artifactId>
- <groupId>commons-httpclient</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avatica</artifactId>
- <groupId>org.apache.calcite.avatica</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hive-shade</artifactId>
</dependency>
<!--
https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
<dependency>
diff --git a/fe/java-udf/pom.xml b/fe/java-udf/pom.xml
index 8f6ae450d7..a78c7641d7 100644
--- a/fe/java-udf/pom.xml
+++ b/fe/java-udf/pom.xml
@@ -55,14 +55,17 @@ under the License.
</exclusion>
</exclusions>
</dependency-->
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hive-shade</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <classifier>core</classifier>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index 59759046eb..f6687a1279 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -252,6 +252,7 @@ under the License.
<zookeeper.version>3.4.14</zookeeper.version>
<tbds.hadoop.version>2.7.2-TBDS-5.2.0.1</tbds.hadoop.version>
<tbds.hive.version>2.2.0-TBDS-5.2.0.1</tbds.hive.version>
+ <doris.tbds.version>1.0.1-SNAPSHOT</doris.tbds.version>
</properties>
<repositories>
<repository>
@@ -326,9 +327,14 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${tbds.hadoop.version}</version>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hadoop-shade</artifactId>
+ <version>${doris.tbds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hive-shade</artifactId>
+ <version>${doris.tbds.version}</version>
</dependency>
<!--
https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper -->
<dependency>
@@ -758,105 +764,6 @@ under the License.
<version>${spark.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <version>${tbds.hive.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- <exclusion>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- </exclusion>
- <!-- confilict with parquet version in iceberg -->
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>parquet-hadoop-bundle</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <classifier>core</classifier>
- <version>${tbds.hive.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-vector-code-gen</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-llap-tez</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-shims</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-registry</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-serde</artifactId>
- <version>${tbds.hive.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdfs</artifactId>
- <version>${tbds.hadoop.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
@@ -885,26 +792,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${tbds.hadoop.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>jdk.tools</groupId>
- <artifactId>jdk.tools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.iceberg/iceberg-core -->
<dependency>
diff --git a/fe/spark-dpp/pom.xml b/fe/spark-dpp/pom.xml
index bd4bd33990..c2bc68f0e9 100644
--- a/fe/spark-dpp/pom.xml
+++ b/fe/spark-dpp/pom.xml
@@ -111,9 +111,8 @@ under the License.
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>tbds-hadoop-shade</artifactId>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
