From 6d57726c0173671c1b46b1530d9520e6c9c234a1 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Mon, 8 Jan 2024 16:10:42 +0100
Subject: [PATCH] PHOENIX-7168 Remove shaded protobuf from shaded connector
 JARs

---
 phoenix5-hive-shaded/pom.xml   | 5 +++++
 phoenix5-spark-shaded/pom.xml  | 5 +++++
 phoenix5-spark3-shaded/pom.xml | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/phoenix5-hive-shaded/pom.xml b/phoenix5-hive-shaded/pom.xml
index dd24215b..52fdade9 100644
--- a/phoenix5-hive-shaded/pom.xml
+++ b/phoenix5-hive-shaded/pom.xml
@@ -286,6 +286,11 @@
       <artifactId>hbase-shaded-protobuf</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <!-- Other dependencies we don't want to shade in, but are not transitively excluded by the
     above for some reason -->
     <dependency>
diff --git a/phoenix5-spark-shaded/pom.xml b/phoenix5-spark-shaded/pom.xml
index 1b9ff721..f9fb93d9 100644
--- a/phoenix5-spark-shaded/pom.xml
+++ b/phoenix5-spark-shaded/pom.xml
@@ -217,6 +217,11 @@
       <artifactId>hbase-shaded-protobuf</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <!-- Other dependencies we don't want to shade in, but are not transitively excluded by the
     above for some reason -->
     <dependency>
diff --git a/phoenix5-spark3-shaded/pom.xml b/phoenix5-spark3-shaded/pom.xml
index cfc90a01..f3bc82c5 100644
--- a/phoenix5-spark3-shaded/pom.xml
+++ b/phoenix5-spark3-shaded/pom.xml
@@ -217,6 +217,11 @@
       <artifactId>hbase-shaded-protobuf</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <!-- Other dependencies we don't want to shade in, but are not transitively excluded by the
     above for some reason -->
     <dependency>