This is an automated email from the ASF dual-hosted git repository.
kirs 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 a093837 upgrade hive-catalog-shade dependencies (#45)
a093837 is described below
commit a09383706867825c8022a90e69cba65895b1d544
Author: Calvin Kirs <k...@apache.org>
AuthorDate: Sat May 11 14:53:55 2024 +0800
upgrade hive-catalog-shade dependencies (#45)
* Upgrade paimon to 0.8.0
Upgrade bcpkix-jdkon15 dependency to bcpkix-jdkon18
* add change log
* Update CHANGE-LOG.md
---
CHANGE-LOG.md | 11 ++++++++---
hive-catalog-shade/pom.xml | 27 +++++++++++++++------------
pom.xml | 2 +-
3 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/CHANGE-LOG.md b/CHANGE-LOG.md
index eb8cb3b..de331b7 100644
--- a/CHANGE-LOG.md
+++ b/CHANGE-LOG.md
@@ -1,6 +1,11 @@
## Changes
-### 2.0.0
+### 2.1
+#### 2.1.0
+- Upgrade paimon to 0.8.0
+- Upgrade bcpkix-jdkon15 dependency to bcpkix-jdkon18
+### 2.0
+#### 2.0.0
- upgrade avro to 1.11.3
- upgrade parquet to 1.13.1
- upgrade guava to 32.1.2-jre
@@ -9,8 +14,8 @@
- upgrade paimon to 0.7.0
- exclude some dependencies
-### 2.0.1
+#### 2.0.1
- Set HikariCP Scope to Provided (#42)
-### 2.0.2
+#### 2.0.2
- The com.aliyun.datalake package should not be renamed
diff --git a/hive-catalog-shade/pom.xml b/hive-catalog-shade/pom.xml
index 95744c9..53baa3f 100644
--- a/hive-catalog-shade/pom.xml
+++ b/hive-catalog-shade/pom.xml
@@ -20,7 +20,7 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>hive-catalog-shade</artifactId>
@@ -31,11 +31,11 @@ under the License.
<hadoop.version>3.3.6</hadoop.version>
<hive.storage.api.version>2.8.1</hive.storage.api.version>
<iceberg-hive-metastore.version>1.4.3</iceberg-hive-metastore.version>
-
<paimon-hive-metastore.version>0.7.0-incubating</paimon-hive-metastore.version>
+ <paimon-hive-metastore.version>0.8.0</paimon-hive-metastore.version>
<avro.version>1.11.3</avro.version>
<ivy.version>2.5.2</ivy.version>
<parquet.version>1.13.1</parquet.version>
- <bcproy.version>1.70</bcproy.version>
+ <bcpkix.version>1.78.1</bcpkix.version>
<guava.version>32.1.2-jre</guava.version>
<gson.version>2.10</gson.version>
</properties>
@@ -78,20 +78,11 @@ under the License.
<artifactId>parquet-hadoop-bundle</artifactId>
<version>${parquet.version}</version>
</dependency>
- <!--
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
- <!--
https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bcproy.version}</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
-
- <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson
-->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
@@ -545,6 +536,14 @@ under the License.
</exclusion>
</exclusions>
</dependency>
+ <!--should be provided in fe module-->
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bcpkix.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- for aliyun dlf -->
<dependency>
<groupId>com.aliyun.datalake</groupId>
@@ -563,6 +562,10 @@ under the License.
<groupId>com.aliyun</groupId>
<artifactId>tea-util</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index ed57ce6..a3f629f 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>2.0.2-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Archetype - doris-shade</name>
<url>https://doris.apache.org</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
