You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by di...@apache.org on 2023/06/09 03:24:37 UTC
[doris-shade] branch master updated: [Release]Add change log (#21)
This is an automated email from the ASF dual-hosted git repository.
diwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-shade.git
The following commit(s) were added to refs/heads/master by this push:
new 5fe6fd1 [Release]Add change log (#21)
5fe6fd1 is described below
commit 5fe6fd188610694b23d1096daef46a0a0b6b072d
Author: Calvin Kirs <ac...@163.com>
AuthorDate: Fri Jun 9 11:24:33 2023 +0800
[Release]Add change log (#21)
* Add new hive catalog shade package to resolve version conflicts (#7)
- The thrift used internally by hive is not compatible with the thrift version used internally by our doris
* Hive-catalog shade package dependency slimming (#11)
* Update pom.xml
* rename commons-lang3 (#13)
* [maven-release-plugin] prepare release doris-shade-1.0.1
* [maven-release-plugin] prepare for next development iteration
* rename commons-cli to prevent conflicts (#14)
* [hive-catalog] update to 1.0.3 snapshot (#15)
* [paimon-catalog] Add paimon-catalog (#18)
Co-authored-by: hugoluo <hu...@tencent.com>
* rename com.google.flatbuffers (#19)
* 1.0.1-pre-release
---------
Co-authored-by: wudi <67...@qq.com>
Co-authored-by: wudi <>
Co-authored-by: Mingyu Chen <mo...@163.com>
Co-authored-by: yuxuan-luo <11...@users.noreply.github.com>
Co-authored-by: hugoluo <hu...@tencent.com>
Co-authored-by: WenYao <72...@qq.com>
---
CHANGE-LOG.txt | 8 +-
hadoop-aws-shade-2/pom.xml | 2 +-
hadoop-cloud-shade-2/pom.xml | 2 +-
hadoop-shade-2/pom.xml | 2 +-
{hive-shade-3 => hive-catalog-shade}/pom.xml | 249 ++++++++++++++++++++-------
hive-shade-3/pom.xml | 2 +-
hudi-mr-shade-0.13/pom.xml | 2 +-
kerby-shade-1.0/pom.xml | 2 +-
pom.xml | 3 +-
spring-shade-5/pom.xml | 2 +-
thrift-shade-0.13/pom.xml | 4 +-
11 files changed, 200 insertions(+), 78 deletions(-)
diff --git a/CHANGE-LOG.txt b/CHANGE-LOG.txt
index 202faa9..818aa74 100644
--- a/CHANGE-LOG.txt
+++ b/CHANGE-LOG.txt
@@ -1,3 +1,7 @@
-# Apache Doris Shade Dependencies
+## Changes
-This repository contains a number of shaded dependencies for the Apache Doris project.
\ No newline at end of file
+- Add hadoop dependency shade
+- Add thrift dependency shade
+- Add hive catalog dependency shade
+- Add kerby dependency shade
+- Add Spring5 dependency shade
diff --git a/hadoop-aws-shade-2/pom.xml b/hadoop-aws-shade-2/pom.xml
index 00121be..ef75270 100644
--- a/hadoop-aws-shade-2/pom.xml
+++ b/hadoop-aws-shade-2/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>hadoop-aws-shade-2</artifactId>
diff --git a/hadoop-cloud-shade-2/pom.xml b/hadoop-cloud-shade-2/pom.xml
index 6fe44a4..8ec2798 100644
--- a/hadoop-cloud-shade-2/pom.xml
+++ b/hadoop-cloud-shade-2/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>hadoop-cloud-shade-2</artifactId>
diff --git a/hadoop-shade-2/pom.xml b/hadoop-shade-2/pom.xml
index e39b9f2..f09d6d2 100644
--- a/hadoop-shade-2/pom.xml
+++ b/hadoop-shade-2/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>hadoop-shade-2</artifactId>
diff --git a/hive-shade-3/pom.xml b/hive-catalog-shade/pom.xml
similarity index 61%
copy from hive-shade-3/pom.xml
copy to hive-catalog-shade/pom.xml
index 7783dc1..f8ace18 100644
--- a/hive-shade-3/pom.xml
+++ b/hive-catalog-shade/pom.xml
@@ -15,23 +15,25 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <artifactId>hive-shade-3</artifactId>
+ <artifactId>hive-catalog-shade</artifactId>
<properties>
<hive.version>3.1.3</hive.version>
- <hive-storage-api.version>2.8.1</hive-storage-api.version>
+ <!--We rewritten some hive methods, so we need to keep the same hadoop version as the main library-->
<hadoop.version>3.3.4</hadoop.version>
+ <hive.storage.api.version>2.8.1</hive.storage.api.version>
+ <iceberg-hive-metastore.version>1.1.0</iceberg-hive-metastore.version>
+ <paimon-hive-metastore.version>0.4-SNAPSHOT</paimon-hive-metastore.version>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -66,6 +68,22 @@ under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
@@ -83,20 +101,44 @@ under the License.
<artifactId>httpclient</artifactId>
</exclusion>
<exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
+ <artifactId>hadoop-common</artifactId>
+ <groupId>org.apache.hadoop</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>orc-core</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
</exclusion>
<exclusion>
- <groupId>org.eclipse.jetty</groupId>
+ <groupId>org.apache.arrow</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-common</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-yarn-server-common</artifactId>
+ <artifactId>hadoop-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -104,13 +146,12 @@ under the License.
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
- <version>${hive-storage-api.version}</version>
+ <version>${hive.storage.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
@@ -138,24 +179,12 @@ under the License.
<artifactId>hbase-client</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
+ <artifactId>netty-all</artifactId>
+ <groupId>io.netty</groupId>
</exclusion>
<exclusion>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -169,10 +198,6 @@ under the License.
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
@@ -214,23 +239,76 @@ under the License.
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <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>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--Since we access through the hive catalog, and the thrift version used by hive is not compatible with the
+ current internal version used by doris, this jar must be introduced to complete to rename.-->
+ <dependency>
+ <groupId>org.apache.iceberg</groupId>
+ <artifactId>iceberg-hive-metastore</artifactId>
+ <version>${iceberg-hive-metastore.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.roaringbitmap</groupId>
+ <artifactId>RoaringBitmap</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-standalone-metastore</artifactId>
- <version>3.1.3</version>
+ <version>${hive.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
</exclusion>
<exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
</exclusion>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
@@ -238,15 +316,35 @@ under the License.
</exclusion>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-json</artifactId>
+ <artifactId>metrics-jvm</artifactId>
</exclusion>
<exclusion>
<groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
+ <artifactId>metrics-json</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-classification</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-hive-connector-3.1</artifactId>
+ <version>${paimon-hive-metastore.version}</version>
+ <exclusions>
<exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.roaringbitmap</groupId>
+ <artifactId>RoaringBitmap</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
@@ -256,33 +354,31 @@ under the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.paimon</groupId>
+ <artifactId>paimon-hive-common</artifactId>
+ <version>${paimon-hive-metastore.version}</version>
+ <exclusions>
<exclusion>
- <groupId>org.apache.calcite</groupId>
- <artifactId>calcite-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
+ <groupId>org.roaringbitmap</groupId>
+ <artifactId>RoaringBitmap</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.orc</groupId>
- <artifactId>orc-core</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-classification</artifactId>
- <version>3.1.3</version>
- </dependency>
</dependencies>
<build>
@@ -298,7 +394,8 @@ under the License.
<phase>package</phase>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
- <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml
+ </dependencyReducedPomLocation>
<filters>
<filter>
<artifact>*:*</artifact>
@@ -327,8 +424,28 @@ under the License.
<shadedPattern>shade.doris.hive.com.google.gson</shadedPattern>
</relocation>
<relocation>
- <pattern>io.netty</pattern>
- <shadedPattern>shade.doris.hive.io.netty</shadedPattern>
+ <pattern>org.apache.thrift</pattern>
+ <shadedPattern>shade.doris.hive.org.apache.thrift</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+ <shadedPattern>shade.doris.hive.com.google.protobuf</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.http.impl</pattern>
+ <shadedPattern>shade.doris.hive.org.apache.http.impl</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.lang3</pattern>
+ <shadedPattern>shade.doris.hive.org.apache.commons.lang3</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.commons.cli</pattern>
+ <shadedPattern>shade.doris.hive.org.apache.commons.cli</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.flatbuffers</pattern>
+ <shadedPattern>shade.doris.hive.com.google.flatbuffers</shadedPattern>
</relocation>
</relocations>
</configuration>
@@ -337,4 +454,4 @@ under the License.
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/hive-shade-3/pom.xml b/hive-shade-3/pom.xml
index 7783dc1..78492fb 100644
--- a/hive-shade-3/pom.xml
+++ b/hive-shade-3/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>hive-shade-3</artifactId>
diff --git a/hudi-mr-shade-0.13/pom.xml b/hudi-mr-shade-0.13/pom.xml
index b20917c..258715e 100644
--- a/hudi-mr-shade-0.13/pom.xml
+++ b/hudi-mr-shade-0.13/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>hudi-mr-shade-0.13</artifactId>
diff --git a/kerby-shade-1.0/pom.xml b/kerby-shade-1.0/pom.xml
index 70bc032..8f84c4e 100644
--- a/kerby-shade-1.0/pom.xml
+++ b/kerby-shade-1.0/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>kerby-shade-1.0</artifactId>
diff --git a/pom.xml b/pom.xml
index c349889..17f0ee7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@ under the License.
</parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Archetype - doris-shade</name>
<url>https://doris.apache.org</url>
@@ -52,6 +52,7 @@ under the License.
<module>hadoop-cloud-shade-2</module>
<module>hadoop-aws-shade-2</module>
<module>kerby-shade-1.0</module>
+ <module>hive-catalog-shade</module>
</modules>
<properties>
diff --git a/spring-shade-5/pom.xml b/spring-shade-5/pom.xml
index 6910a05..3a745a1 100644
--- a/spring-shade-5/pom.xml
+++ b/spring-shade-5/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>spring-shade-5</artifactId>
diff --git a/thrift-shade-0.13/pom.xml b/thrift-shade-0.13/pom.xml
index 3beb8c2..31ac858 100644
--- a/thrift-shade-0.13/pom.xml
+++ b/thrift-shade-0.13/pom.xml
@@ -21,10 +21,10 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>thrift-shade-0.13</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<libethrift.version>0.13.0</libethrift.version>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org