From aff26348a3d17b23042411502afacd0fa5d463ea Mon Sep 17 00:00:00 2001
From: aib628 <vmaster.cc@gmail.com>
Date: Fri, 18 Aug 2023 15:25:51 +0800
Subject: [PATCH] =?UTF-8?q?[modify]hudi-flink-bundle=E5=A2=9E=E5=8A=A0Guav?=
 =?UTF-8?q?e=E5=8C=85=E7=9A=84relocation=E5=92=8Cinclude=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hudi-flink-datasource/hudi-flink1.18.x/pom.xml | 1 -
 packaging/hudi-flink-bundle/pom.xml            | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hudi-flink-datasource/hudi-flink1.18.x/pom.xml b/hudi-flink-datasource/hudi-flink1.18.x/pom.xml
index d3f9203983c1..40298d57e3b1 100644
--- 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
index e1539ae1bc93..868e7a77f0f5 100644
--- 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>