From 9c70c82021a62314f584e1e53220dda747d0f97e Mon Sep 17 00:00:00 2001
From: zyxxoo <1318247699@qq.com>
Date: Mon, 19 Jul 2021 20:05:58 +0800
Subject: [PATCH] HBASE-26097: to resolve hbase version 2.x protobuf version
conflict
---
hbase-shaded/hbase-shaded-endpoint/pom.xml | 163 +++++++++++++++++++++
hbase-shaded/pom.xml | 1 +
pom.xml | 1 +
3 files changed, 165 insertions(+)
create mode 100644 hbase-shaded/hbase-shaded-endpoint/pom.xml
diff --git a/hbase-shaded/hbase-shaded-endpoint/pom.xml b/hbase-shaded/hbase-shaded-endpoint/pom.xml
new file mode 100644
index 000000000000..4d4b5e9b71c3
--- /dev/null
+++ b/hbase-shaded/hbase-shaded-endpoint/pom.xml
@@ -0,0 +1,163 @@
+
+
+
+ 4.0.0
+
+ hbase-shaded
+ org.apache.hbase
+ 2.0.6
+ ..
+
+ hbase-shaded-endpoint
+ Apache HBase - Shaded - Endpoint
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+
+ true
+
+
+
+
+ maven-assembly-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 3.0.0
+
+
+ attach-sources
+ verify
+
+ jar-no-fork
+
+
+
+
+
+
+
+
+ org.apache.hbase
+ hbase-endpoint
+
+
+ org.apache.hbase
+ hbase-server
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+
+
+ org.apache.hadoop
+ hadoop-yarn-api
+
+
+ org.apache.hadoop
+ hadoop-client
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-jobclient
+
+
+ com.sun.jersey
+ jersey-core
+
+
+ com.sun.jersey
+ jersey-server
+
+
+ com.sun.jersey
+ jersey-json
+
+
+ com.sun.jersey
+ jersey-client
+
+
+ com.sun.jersey.contribs
+ jersey-guice
+
+
+ javax.servlet
+ servlet-api
+
+
+ javax.servlet.jsp
+ jsp-api
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ org.slf4j
+ slf4j-api
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+
+
+
+ release
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 53f879e3ae44..0df1257424df 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -40,6 +40,7 @@
hbase-shaded-client
+ hbase-shaded-endpoint
hbase-shaded-mapreduce
hbase-shaded-check-invariants
diff --git a/pom.xml b/pom.xml
index d6ae2d7780db..a0f8e18a0da2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
hbase-metrics-api
hbase-metrics
hbase-zookeeper
+ hbase-shaded-endpoint
scm:git:git://gitbox.apache.org/repos/asf/hbase.git