diff --git a/connector/connect/client/jvm/pom.xml b/connector/connect/client/jvm/pom.xml
index 44c653462fa28..e1f5cf0b41f12 100644
--- a/connector/connect/client/jvm/pom.xml
+++ b/connector/connect/client/jvm/pom.xml
@@ -105,11 +105,19 @@
com.google.guava:*
+ io.grpc:*
com.google.protobuf:*
org.apache.spark:spark-connect-common_${scala.binary.version}
+
+ io.grpc
+ ${spark.shade.packageName}.connect.client.grpc
+
+ io.grpc.**
+
+
com.google.protobuf
${spark.shade.packageName}.connect.protobuf
@@ -132,6 +140,10 @@
+
+
+
+
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 9f478d649bafe..9579123c25ca0 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -870,6 +870,7 @@ object SparkConnectClient {
},
(assembly / assemblyShadeRules) := Seq(
+ ShadeRule.rename("io.grpc.**" -> "org.sparkproject.connect.client.grpc.@0").inAll,
ShadeRule.rename("com.google.protobuf.**" -> "org.sparkproject.connect.protobuf.@1").inAll,
ShadeRule.rename("com.google.common.**" -> "org.sparkproject.connect.client.guava.@1").inAll,
ShadeRule.rename("com.google.thirdparty.**" -> "org.sparkproject.connect.client.guava.@1").inAll,