This is an automated email from the ASF dual-hosted git repository.

morningman 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 97686d5  [3.1.1]Upgrade Iceberg and Paimon (#60)
97686d5 is described below

commit 97686d5c56d59521c411bf173ea0bfbadb9b6a18
Author: Calvin Kirs <[email protected]>
AuthorDate: Mon Mar 2 15:39:24 2026 +0800

    [3.1.1]Upgrade Iceberg and Paimon (#60)
---
 CHANGE-LOG.md              |  4 ++++
 hive-catalog-shade/pom.xml | 10 +++++++---
 pom.xml                    |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGE-LOG.md b/CHANGE-LOG.md
index 777f637..9abae23 100644
--- a/CHANGE-LOG.md
+++ b/CHANGE-LOG.md
@@ -1,6 +1,10 @@
 ## Changes
 
 ### 3.1
+#### 3.1.1
+- Upgrade paimon to 1.3.1
+- Upgrade iceberg to 1.10.1
+- Shade com.aliyun.tea to avoid dependency conflicts
 #### 3.1.0
 - Removed unnecessary dependencies including Hadoop, Parquet, Gson, Jackson, 
and other related libraries.
 - Retained only the core runtime dependencies.
diff --git a/hive-catalog-shade/pom.xml b/hive-catalog-shade/pom.xml
index c547288..c4e65b4 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>3.1.0-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>hive-catalog-shade</artifactId>
@@ -30,8 +30,8 @@ under the License.
         <!--We rewritten some hive methods, so we need to keep the same hadoop 
version as the main library-->
         <hadoop.version>3.4.2</hadoop.version>
         <hive.storage.api.version>2.8.1</hive.storage.api.version>
-        <iceberg-hive-metastore.version>1.9.1</iceberg-hive-metastore.version>
-        <paimon-hive-metastore.version>1.1.1</paimon-hive-metastore.version>
+        <iceberg-hive-metastore.version>1.10.1</iceberg-hive-metastore.version>
+        <paimon-hive-metastore.version>1.3.1</paimon-hive-metastore.version>
         <avro.version>1.12.0</avro.version>
         <ivy.version>2.5.2</ivy.version>
         <parquet.version>1.13.1</parquet.version>
@@ -635,6 +635,10 @@ under the License.
                                     <pattern>com.google.flatbuffers</pattern>
                                     
<shadedPattern>shade.doris.hive.com.google.flatbuffers</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.aliyun.tea</pattern>
+                                    
<shadedPattern>shade.doris.hive.com.aliyun.tea</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index cdce493..12ce7e9 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>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Archetype - doris-shade</name>
     <url>https://doris.apache.org</url>
@@ -83,7 +83,7 @@ under the License.
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.6.1</version>
                     <configuration>
                         <transformers>
                             <transformer 
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
 />


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to