You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ya...@apache.org on 2021/02/03 20:07:08 UTC
[phoenix] branch 4.16 updated: PHOENIX-6360 phoenix-core has
compile dependency on phoenix-hbase-compat
This is an automated email from the ASF dual-hosted git repository.
yanxinyi pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 5f68c55 PHOENIX-6360 phoenix-core has compile dependency on phoenix-hbase-compat
5f68c55 is described below
commit 5f68c55c6c533fb70bfb7bd6befdec7a4b64418d
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Feb 3 12:49:14 2021 +0100
PHOENIX-6360 phoenix-core has compile dependency on phoenix-hbase-compat
---
phoenix-assembly/src/build/components/all-common-dependencies.xml | 2 ++
phoenix-client-parent/pom.xml | 5 +++++
phoenix-core/pom.xml | 1 +
phoenix-server/pom.xml | 5 +++++
4 files changed, 13 insertions(+)
diff --git a/phoenix-assembly/src/build/components/all-common-dependencies.xml b/phoenix-assembly/src/build/components/all-common-dependencies.xml
index 6c89fc3..094c967 100644
--- a/phoenix-assembly/src/build/components/all-common-dependencies.xml
+++ b/phoenix-assembly/src/build/components/all-common-dependencies.xml
@@ -28,6 +28,8 @@
<unpack>false</unpack>
<outputDirectory>/lib</outputDirectory>
<includes>
+ <include>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</include>
+
<include>commons-configuration:commons-configuration</include>
<include>commons-io:commons-io</include>
<include>commons-lang:commons-lang</include>
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 7db233c..600ef56 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -276,6 +276,11 @@
<artifactId>phoenix-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
</dependency>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index b5c1c35..779f2e6 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -213,6 +213,7 @@
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 66a2c96..c60528d 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -156,6 +156,11 @@
<artifactId>phoenix-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>2.7.1</version>