You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2024/01/10 12:42:40 UTC

(phoenix-connectors) branch master updated: PHOENIX-7168 Remove shaded protobuf from shaded connector JARs

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d57726  PHOENIX-7168 Remove shaded protobuf from shaded connector JARs
6d57726 is described below

commit 6d57726c0173671c1b46b1530d9520e6c9c234a1
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jan 8 16:10:42 2024 +0100

    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 dd24215..52fdade 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 1b9ff72..f9fb93d 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 cfc90a0..f3bc82c 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>