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
The following commit(s) were added to refs/heads/master by this push:
new dd428301a [AMORO-3943] Shade all third party classes for spark runtime
(#3942)
dd428301a is described below
commit dd428301ab1acf77339b57c7143231814e645461
Author: Fei Wang <[email protected]>
AuthorDate: Mon Dec 29 05:43:55 2025 -0800
[AMORO-3943] Shade all third party classes for spark runtime (#3942)
* relocate
* filter
---
.../v3.3/amoro-mixed-spark-runtime-3.3/pom.xml | 34 ++++++++++++++++++++++
.../v3.5/amoro-mixed-spark-runtime-3.5/pom.xml | 34 ++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml
index 5adcab3de..18200f6c0 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/pom.xml
@@ -121,6 +121,23 @@
<exclude>META-INF/services/org.apache.spark.sql.sources.DataSourceRegister</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>**/log4j.properties</exclude>
+
<exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/*LICENSE*</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/*NOTICE*</exclude>
+
<exclude>META-INF/**/module-info.class</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>mozilla/*.txt</exclude>
+ </excludes>
+ </filter>
</filters>
<relocations>
<!-- relocation amoro spark packages -->
@@ -134,6 +151,11 @@
<pattern>org.apache.orc</pattern>
<shadedPattern>org.apache.amoro.shade.org.apache.orc</shadedPattern>
</relocation>
+ <!-- classes in orc-core -->
+ <relocation>
+ <pattern>org.threeten</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.threeten</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.avro</pattern>
<shadedPattern>org.apache.amoro.shade.org.apache.avro</shadedPattern>
@@ -186,6 +208,18 @@
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>org.apache.amoro.shade.org.apache.commons.lang3</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.io</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.apache.commons.io</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.thrift</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.apache.thrift</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.github.benmanes</pattern>
+
<shadedPattern>org.apache.amoro.shade.com.github.benmanes</shadedPattern>
+ </relocation>
<!-- relocation iceberg -->
<relocation>
diff --git
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-runtime-3.5/pom.xml
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-runtime-3.5/pom.xml
index 0049e99a4..2c78c845b 100644
---
a/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-runtime-3.5/pom.xml
+++
b/amoro-format-mixed/amoro-mixed-spark/v3.5/amoro-mixed-spark-runtime-3.5/pom.xml
@@ -120,6 +120,23 @@
<exclude>META-INF/services/org.apache.spark.sql.sources.DataSourceRegister</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>**/log4j.properties</exclude>
+
<exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/*LICENSE*</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/*NOTICE*</exclude>
+
<exclude>META-INF/**/module-info.class</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>mozilla/*.txt</exclude>
+ </excludes>
+ </filter>
</filters>
<relocations>
<!-- relocation amoro spark packages -->
@@ -133,6 +150,11 @@
<pattern>org.apache.orc</pattern>
<shadedPattern>org.apache.amoro.shade.org.apache.orc</shadedPattern>
</relocation>
+ <!-- classes in orc-core -->
+ <relocation>
+ <pattern>org.threeten</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.threeten</shadedPattern>
+ </relocation>
<relocation>
<pattern>org.apache.avro</pattern>
<shadedPattern>org.apache.amoro.shade.org.apache.avro</shadedPattern>
@@ -185,6 +207,18 @@
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>org.apache.amoro.shade.org.apache.commons.lang3</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>org.apache.commons.io</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.apache.commons.io</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>org.apache.thrift</pattern>
+
<shadedPattern>org.apache.amoro.shade.org.apache.thrift</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.github.benmanes</pattern>
+
<shadedPattern>org.apache.amoro.shade.com.github.benmanes</shadedPattern>
+ </relocation>
<!-- relocation iceberg -->
<relocation>