PHOENIX-7168 Remove shaded protobuf from shaded connector JARs

apache · Jan 10, 2024 · 6d57726 · 6d57726
1 parent 60d4172
commit 6d57726
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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>