[modify]hudi-flink-bundle增加Guave包的relocation和include解决冲突问题

aib628 · Nov 30, 2023 · aff2634 · aff2634
1 parent 35980b6
commit aff2634
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hudi-flink-datasource/hudi-flink1.18.x/pom.xml b/hudi-flink-datasource/hudi-flink1.18.x/pom.xml
@@ -83,7 +83,6 @@
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-shaded-guava</artifactId>
             <version>30.1.1-jre-14.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>

diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml
@@ -136,6 +136,7 @@
                   <include>org.apache.flink:flink-json</include>
                   <include>org.apache.flink:${flink.parquet.artifactId}</include>
                   <include>org.apache.flink:flink-metrics-dropwizard</include>
+                  <include>org.apache.flink:flink-shaded-guava</include>
 
                   <include>org.apache.hive:hive-common</include>
                   <include>org.apache.hive:hive-service</include>
@@ -213,6 +214,10 @@
                   <pattern>org.openjdk.jol.</pattern>
                   <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>com.google.common.</pattern>
+                  <shadedPattern>${flink.bundle.shade.prefix}com.google.common.</shadedPattern>
+                </relocation>
               </relocations>
               <filters>
                 <filter>