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

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


The following commit(s) were added to refs/heads/master by this push:
     new 293d01b24 [#1745][FOLLOWUP] fix(client): exclude kryo when package 
spark shaded client (#2478)
293d01b24 is described below

commit 293d01b243db6efc47c0ec70fa83c9a3a3cb65b2
Author: xianjingfeng <[email protected]>
AuthorDate: Fri May 9 16:13:04 2025 +0800

    [#1745][FOLLOWUP] fix(client): exclude kryo when package spark shaded 
client (#2478)
    
    ### What changes were proposed in this pull request?
    Exclude kryo when package spark shaded client.
    
    ### Why are the changes needed?
    The follow up of #1745.
    NoSuchMethodException will be thrown without this pr.
    
    
uniffle/common/src/main/java/org/apache/uniffle/common/serializer/kryo/KryoSerializerInstance.java
    
    Line 62 in 057dcd2
    
     Method method = cls.getDeclaredMethod("apply", Kryo.class);
    ### Does this PR introduce any user-facing change?
    No.
    
    ### How was this patch tested?
    Manual Testing
---
 client-spark/spark2-shaded/pom.xml | 8 ++++----
 client-spark/spark3-shaded/pom.xml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client-spark/spark2-shaded/pom.xml 
b/client-spark/spark2-shaded/pom.xml
index 22ac1b01a..31a307fe9 100644
--- a/client-spark/spark2-shaded/pom.xml
+++ b/client-spark/spark2-shaded/pom.xml
@@ -49,6 +49,10 @@
           <artifactId>slf4j-api</artifactId>
           <groupId>org.slf4j</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>com.esotericsoftware</groupId>
+          <artifactId>kryo-shaded</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- log4j2 -->
@@ -216,10 +220,6 @@
                   <pattern>META-INF/license</pattern>
                   <shadedPattern>META-INF/license-tmp</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>com.esotericsoftware</pattern>
-                  
<shadedPattern>${rss.shade.packageName}.com.esotericsoftware</shadedPattern>
-                </relocation>
               </relocations>
             </configuration>
           </execution>
diff --git a/client-spark/spark3-shaded/pom.xml 
b/client-spark/spark3-shaded/pom.xml
index 018ea534e..74831a256 100644
--- a/client-spark/spark3-shaded/pom.xml
+++ b/client-spark/spark3-shaded/pom.xml
@@ -49,6 +49,10 @@
           <artifactId>slf4j-api</artifactId>
           <groupId>org.slf4j</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>com.esotericsoftware</groupId>
+          <artifactId>kryo-shaded</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- log4j2 -->
@@ -216,10 +220,6 @@
                   <pattern>META-INF/license</pattern>
                   <shadedPattern>META-INF/license-tmp</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>com.esotericsoftware</pattern>
-                  
<shadedPattern>${rss.shade.packageName}.com.esotericsoftware</shadedPattern>
-                </relocation>
               </relocations>
             </configuration>
           </execution>

Reply via email to