(linkis) 02/05: fix: 排除错误的传递依赖 jackson-module-scala_2.11 和 hadoop-hdfs-2.7.2

[ki...@apache.org]

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

aiceflower pushed a commit to branch fix-master-compile
in repository https://gitbox.apache.org/repos/asf/linkis.git

commit 42865b4083220ad660de8db89f66e8ffcc341ba1
Author: aiceflower <ai...@sina.com>
AuthorDate: Tue Jun 23 16:45:51 2026 +0800

    fix: 排除错误的传递依赖 jackson-module-scala_2.11 和 hadoop-hdfs-2.7.2
    
    问题: Maven 传递依赖解析时，scala.binary.version property 在 linkis-common
    的依赖声明中未正确传递到 linkis-dist，导致 jackson-module-scala_2.11 (应为 2.12)
    和 hadoop-hdfs:2.7.2 (应为 hadoop-hdfs-client:3.3.4) 被错误打包。
    
    修复: 在 linkis-dist/pom.xml 中显式排除这两个错误版本并引入正确版本。
    
    Co-Authored-By: Claude Opus 4.7 <no...@anthropic.com>
---
 linkis-dist/pom.xml                            | 11 +++++++++++
 linkis-dist/src/main/assembly/distribution.xml |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/linkis-dist/pom.xml b/linkis-dist/pom.xml
index dbc115f829..d63bd6b3c8 100644
--- a/linkis-dist/pom.xml
+++ b/linkis-dist/pom.xml
@@ -158,6 +158,17 @@
       <artifactId>commons-beanutils</artifactId>
     </dependency>
 
+    <!-- 显式引入正确的 scala/hadoop 依赖，覆盖传递依赖中的错误版本 -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-scala_2.12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs-client</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/linkis-dist/src/main/assembly/distribution.xml b/linkis-dist/src/main/assembly/distribution.xml
index c1f876896a..0bc2d1dfd8 100644
--- a/linkis-dist/src/main/assembly/distribution.xml
+++ b/linkis-dist/src/main/assembly/distribution.xml
@@ -301,6 +301,8 @@
             <useStrictFiltering>false</useStrictFiltering>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>
+                <exclude>com.fasterxml.jackson.module:jackson-module-scala_2.11:*</exclude>
+                <exclude>org.apache.hadoop:hadoop-hdfs:*</exclude>
             </excludes>
         </dependencySet>
     </dependencySets>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org