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

jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git

commit 7ca00b4dabda0705587221518e4a19e2425cc7b9
Author: Yaguang Jia <[email protected]>
AuthorDate: Wed Jul 30 17:37:30 2025 +0800

    [AMORO-3697] add Flink 1.18 support for mixed-format
---
 .../amoro-mixed-flink-common-format/pom.xml        |   2 +-
 .../pom.xml                                        |  11 +-
 .../amoro-mixed-flink-common/pom.xml               |  14 +-
 .../amoro/flink/lookup/RocksDBCacheState.java      |   4 +-
 .../amoro/flink/lookup/RocksDBSetSpilledState.java |   2 +-
 .../amoro/flink/read/internals/KafkaSource.java    |   2 +-
 .../org/apache/amoro/flink/lookup/TestKVTable.java |   6 +-
 .../hybrid/reader/TestRowDataReaderFunction.java   |   2 +-
 .../org/apache/amoro/flink/table/TestJoin.java     |   2 +-
 amoro-format-mixed/amoro-mixed-flink/pom.xml       |   7 +-
 .../v1.18/amoro-mixed-flink-1.18/pom.xml           | 101 ++++++++
 .../v1.18/amoro-mixed-flink-runtime-1.18/pom.xml   | 262 +++++++++++++++++++++
 12 files changed, 389 insertions(+), 26 deletions(-)

diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml
index 0b286a8c9..6d10cdccc 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-format/pom.xml
@@ -31,7 +31,7 @@
     <url>https://amoro.apache.org</url>
 
     <properties>
-        <flink.version>1.17.1</flink.version>
+        <flink.version>1.18.1</flink.version>
     </properties>
 
     <dependencies>
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml
index 55f5c12cd..108b8f41e 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common-iceberg-bridge/pom.xml
@@ -31,10 +31,9 @@
     <url>https://amoro.apache.org</url>
 
     <properties>
-        <kafka.version>3.2.3</kafka.version>
         <assertj.version>3.21.0</assertj.version>
-        <testcontainers.version>1.17.2</testcontainers.version>
-        <flink.version>1.17.1</flink.version>
+        <testcontainers.version>1.18.1</testcontainers.version>
+        <flink.version>1.18.1</flink.version>
     </properties>
 
     <dependencies>
@@ -58,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-flink-1.17</artifactId>
+            <artifactId>iceberg-flink-1.18</artifactId>
             <version>${iceberg.version}</version>
             <scope>provided</scope>
             <exclusions>
@@ -99,7 +98,7 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-kafka</artifactId>
-            <version>${flink.version}</version>
+            <version>${flink-kafka.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -184,7 +183,7 @@
 
         <dependency>
             <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-flink-1.17</artifactId>
+            <artifactId>iceberg-flink-1.18</artifactId>
             <version>${iceberg.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml
index c91867df4..c71541c3f 100644
--- a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml
@@ -34,11 +34,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <iceberg.version>1.4.3</iceberg.version>
-        <kafka.version>3.2.3</kafka.version>
         <assertj.version>3.21.0</assertj.version>
-        <testcontainers.version>1.17.2</testcontainers.version>
-        <flink.version>1.17.2</flink.version>
+        <testcontainers.version>1.18.1</testcontainers.version>
+        <flink.version>1.18.1</flink.version>
     </properties>
 
     <dependencies>
@@ -67,7 +65,7 @@
 
         <dependency>
             <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-flink-1.17</artifactId>
+            <artifactId>iceberg-flink-1.18</artifactId>
             <version>${iceberg.version}</version>
             <scope>provided</scope>
             <exclusions>
@@ -88,7 +86,7 @@
 
         <dependency>
             <groupId>org.apache.paimon</groupId>
-            <artifactId>paimon-flink-1.17</artifactId>
+            <artifactId>paimon-flink-1.18</artifactId>
             <version>${paimon.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -121,7 +119,7 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-kafka</artifactId>
-            <version>${flink.version}</version>
+            <version>${flink-kafka.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -223,7 +221,7 @@
 
         <dependency>
             <groupId>org.apache.iceberg</groupId>
-            <artifactId>iceberg-flink-1.17</artifactId>
+            <artifactId>iceberg-flink-1.18</artifactId>
             <version>${iceberg.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
index a82bff54d..2f5b93c35 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBCacheState.java
@@ -23,8 +23,8 @@ import org.apache.amoro.utils.map.RocksDBBackend;
 import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.metrics.Gauge;
 import org.apache.flink.metrics.MetricGroup;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
+import org.apache.flink.shaded.guava31.com.google.common.cache.Cache;
+import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.types.RowKind;
 import org.apache.flink.util.FlinkRuntimeException;
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
index 5215ed812..3f8016bdf 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/lookup/RocksDBSetSpilledState.java
@@ -22,7 +22,7 @@ import 
org.apache.amoro.shade.guava32.com.google.common.collect.Sets;
 import org.apache.amoro.utils.map.RocksDBBackend;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.flink.metrics.MetricGroup;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
+import org.apache.flink.shaded.guava31.com.google.common.cache.Cache;
 import org.apache.flink.table.data.RowData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
index 56317638a..c6643e5ee 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/read/internals/KafkaSource.java
@@ -179,7 +179,7 @@ public class KafkaSource<OUT>
         props,
         enumContext,
         boundedness,
-        checkpoint.assignedPartitions());
+        checkpoint);
   }
 
   @Internal
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
index 1f830cb6d..3dc0551cc 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/lookup/TestKVTable.java
@@ -30,9 +30,9 @@ import org.apache.flink.configuration.Configuration;
 import org.apache.flink.core.memory.DataInputDeserializer;
 import org.apache.flink.core.memory.DataOutputSerializer;
 import org.apache.flink.metrics.groups.UnregisteredMetricsGroup;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Lists;
+import org.apache.flink.shaded.guava31.com.google.common.cache.Cache;
+import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder;
+import org.apache.flink.shaded.guava31.com.google.common.collect.Lists;
 import org.apache.flink.table.catalog.Column;
 import org.apache.flink.table.catalog.ResolvedSchema;
 import org.apache.flink.table.catalog.UniqueConstraint;
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
index 4bad7e47f..a86e2afda 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/read/hybrid/reader/TestRowDataReaderFunction.java
@@ -31,7 +31,7 @@ import org.apache.amoro.scan.ChangeTableIncrementalScan;
 import org.apache.amoro.scan.MixedFileScanTask;
 import org.apache.amoro.table.KeyedTable;
 import org.apache.flink.configuration.Configuration;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Maps;
+import org.apache.flink.shaded.guava31.com.google.common.collect.Maps;
 import org.apache.flink.table.data.GenericRowData;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.data.StringData;
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
index da5347a5e..8d2d4bed0 100644
--- 
a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
+++ 
b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/test/java/org/apache/amoro/flink/table/TestJoin.java
@@ -32,7 +32,7 @@ import org.apache.amoro.table.KeyedTable;
 import org.apache.amoro.table.TableIdentifier;
 import org.apache.flink.api.common.JobStatus;
 import org.apache.flink.runtime.testutils.CommonTestUtils;
-import org.apache.flink.shaded.guava30.com.google.common.collect.Lists;
+import org.apache.flink.shaded.guava31.com.google.common.collect.Lists;
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.TableResult;
 import org.apache.flink.table.api.TableSchema;
diff --git a/amoro-format-mixed/amoro-mixed-flink/pom.xml 
b/amoro-format-mixed/amoro-mixed-flink/pom.xml
index edfb67d90..8f8980ec1 100644
--- a/amoro-format-mixed/amoro-mixed-flink/pom.xml
+++ b/amoro-format-mixed/amoro-mixed-flink/pom.xml
@@ -43,12 +43,15 @@
         <module>v1.16/amoro-mixed-flink-runtime-1.16</module>
         <module>v1.17/amoro-mixed-flink-1.17</module>
         <module>v1.17/amoro-mixed-flink-runtime-1.17</module>
+        <module>v1.18/amoro-mixed-flink-1.18</module>
+        <module>v1.18/amoro-mixed-flink-runtime-1.18</module>
     </modules>
 
     <properties>
         <!--    default flink version    -->
-        <flink.version>1.17.1</flink.version>
-        <kafka.version>2.4.1</kafka.version>
+        <flink.version>1.18.1</flink.version>
+        <flink-kafka.version>3.2.0-1.18</flink-kafka.version>
+        <kafka.version>3.4.0</kafka.version>
         <gson.version>2.9.0</gson.version>
         <jackson.vesion>2.10.2</jackson.vesion>
     </properties>
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-1.18/pom.xml 
b/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-1.18/pom.xml
new file mode 100644
index 000000000..3b914c16e
--- /dev/null
+++ b/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-1.18/pom.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY 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";>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.amoro</groupId>
+        <artifactId>amoro-mixed-flink</artifactId>
+        <version>0.9-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>amoro-format-mixed-flink-1.18</artifactId>
+    <name>Amoro Project Mixed Format Flink 1.18</name>
+    <url>https://amoro.apache.org</url>
+
+    <packaging>jar</packaging>
+
+    <properties>
+        <kafka.version>3.2.3</kafka.version>
+        <assertj.version>3.21.0</assertj.version>
+        <testcontainers.version>1.18.1</testcontainers.version>
+        <flink.version>1.18.1</flink.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.amoro</groupId>
+            <artifactId>amoro-mixed-flink-common</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.iceberg</groupId>
+            <artifactId>iceberg-flink-1.18</artifactId>
+            <version>${iceberg.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.parquet</groupId>
+                    <artifactId>parquet-column</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.parquet</groupId>
+                    <artifactId>parquet-avro</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.paimon</groupId>
+            <artifactId>paimon-flink-1.18</artifactId>
+            <version>${paimon.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade-amoro</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes combine.children="append">
+                                    
<include>org.apache.amoro:amoro-format-mixed-flink-common</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git 
a/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-runtime-1.18/pom.xml
 
b/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-runtime-1.18/pom.xml
new file mode 100644
index 000000000..e224c6931
--- /dev/null
+++ 
b/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-runtime-1.18/pom.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY 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";>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.amoro</groupId>
+        <artifactId>amoro-mixed-flink</artifactId>
+        <version>0.9-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>amoro-format-mixed-flink-runtime-1.18</artifactId>
+    <name>Amoro Project Mixed Format Flink 1.18 Runtime</name>
+    <url>https://amoro.apache.org</url>
+
+    <properties>
+        <flink.version>1.18.1</flink.version>
+        <flink-kafka.version>3.2.0-1.18</flink-kafka.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.amoro</groupId>
+            <artifactId>amoro-format-mixed-flink-1.18</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-kafka</artifactId>
+            <version>${flink-kafka.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.luben</groupId>
+                    <artifactId>zstd-jni</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>${kafka.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.luben</groupId>
+                    <artifactId>zstd-jni</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade-amoro</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <filters>
+                                <filter>
+                                    
<artifact>com.fasterxml.jackson.core:jackson-core</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/versions/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            
<createDependencyReducedPom>false</createDependencyReducedPom>
+                            <artifactSet>
+                                <includes combine.children="append">
+                                    <include>org.apache.amoro:*</include>
+                                    <include>org.apache.iceberg:*</include>
+                                    
<include>com.fasterxml.jackson.core:*</include>
+                                    <include>org.apache.parquet:*</include>
+                                    <include>org.apache.commons:*</include>
+                                    <include>commons-lang:*</include>
+                                    
<include>com.github.ben-manes.caffeine:*</include>
+                                    <include>org.apache.avro:*</include>
+                                    <include>org.apache.orc:*</include>
+                                    <include>io.airlift:*</include>
+                                    <include>commons-collections:*</include>
+                                    <include>cglib:*</include>
+                                    <include>com.google.guava:*</include>
+                                    <include>asm:*</include>
+                                    
<include>org.apache.httpcomponents.client5:*</include>
+                                    
<include>org.apache.httpcomponents.core5:*</include>
+                                    
<include>org.apache.flink:flink-connector-kafka</include>
+                                    <include>org.apache.kafka:*</include>
+                                    <include>com.github.luben:*</include>
+                                    <include>com.github.luben:*</include>
+                                </includes>
+                            </artifactSet>
+
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.iceberg</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.iceberg</shadedPattern>
+                                    <excludes>
+                                        
<exclude>org.apache.iceberg.mr.hive.*</exclude>
+                                    </excludes>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.apache.parquet</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.parquet</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.apache.commons</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.commons
+                                    </shadedPattern>
+                                </relocation>
+                                
+                                <relocation>
+                                    <pattern>org.apache.avro</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.avro</shadedPattern>
+                                </relocation>
+                                
+                                <relocation>
+                                    <pattern>org.apache.orc</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.orc</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.apache.hc</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.hc</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.apache.jute</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.jute</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.apache.kafka</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.apache.kafka</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>shaded.parquet</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.shaded.parquet</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>com.fasterxml</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.com.fasterxml</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    
<pattern>com.github.benmanes.caffeine</pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.com.github.benmanes.caffeine
+                                    </shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.threeten.extra</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.threeten.extra</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>net.sf.cglib</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.net.sf.cglib</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>com.google</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.com.google</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.objectweb.asm</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.org.objectweb.asm</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>com.facebook.fb303</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.com.facebook.fb303</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>io.airlift</pattern>
+                                    
<shadedPattern>org.apache.amoro.shade.io.airlift</shadedPattern>
+                                </relocation>
+
+                                <!-- flink-sql-connector-kafka  -->
+                                <relocation>
+                                    
<pattern>org.apache.flink.connector.kafka</pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.org.apache.flink.connector.kafka
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    
<pattern>org.apache.flink.streaming.connectors.kafka</pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.org.apache.flink.streaming.connectors.kafka
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>
+                                        
org.apache.flink.streaming.util.serialization.JSONKeyValueDeserializationSchema
+                                    </pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.org.apache.flink.streaming.util.serialization.JSONKeyValueDeserializationSchema
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>
+                                        
org.apache.flink.streaming.util.serialization.KeyedDeserializationSchema
+                                    </pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.org.apache.flink.streaming.util.serialization.KeyedDeserializationSchema
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>
+                                        
org.apache.flink.streaming.util.serialization.KeyedSerializationSchema
+                                    </pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.org.apache.flink.streaming.util.serialization.KeyedSerializationSchema
+                                    </shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>
+                                        
org.apache.flink.streaming.util.serialization.TypeInformationKeyValueSerializationSchema
+                                    </pattern>
+                                    <shadedPattern>
+                                        
org.apache.amoro.shade.org.apache.flink.streaming.util.serialization.TypeInformationKeyValueSerializationSchema
+                                    </shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Reply via email to