[phoenix] branch master updated: PHOENIX-5903 Mark more hbase dependency's scope as provided for phoenix-server

[stoty]

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.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d51537  PHOENIX-5903 Mark more hbase dependency's scope as provided 
for phoenix-server
1d51537 is described below

commit 1d515374ceec07a79e166bee0f995e3d2215a977
Author: Guanghao Zhang <zhangguangh...@xiaomi.com>
AuthorDate: Tue May 19 14:24:32 2020 +0800

    PHOENIX-5903 Mark more hbase dependency's scope as provided for 
phoenix-server
---
 phoenix-server/pom.xml | 39 +++++++++++++++++++++++++++++++++++++--
 pom.xml                |  5 +++++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 71d52c1..faa8f6b 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -300,7 +300,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-mapreduce</artifactId>
+      <artifactId>hbase-protocol</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-protocol-shaded</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -310,12 +315,22 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-metrics-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-metrics</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-client</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-protocol</artifactId>
+      <artifactId>hbase-endpoint</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -325,6 +340,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-mapreduce</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-hadoop-compat</artifactId>
       <scope>provided</scope>
     </dependency>
@@ -334,6 +354,21 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-zookeeper</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase.thirdparty</groupId>
+      <artifactId>hbase-shaded-miscellaneous</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase.thirdparty</groupId>
+      <artifactId>hbase-shaded-protobuf</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <scope>provided</scope>
diff --git a/pom.xml b/pom.xml
index 0392dfc..0045520 100644
--- a/pom.xml
+++ b/pom.xml
@@ -841,6 +841,11 @@
         <artifactId>hbase-shaded-miscellaneous</artifactId>
         <version>${hbase.thirdparty.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hbase.thirdparty</groupId>
+        <artifactId>hbase-shaded-protobuf</artifactId>
+        <version>${hbase.thirdparty.version}</version>
+      </dependency>
 
       <!-- HBase test dependencies -->
       <dependency>