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 b4afc08 PHOENIX-6176 Set zookeeper as provided in phoenix-server
b4afc08 is described below
commit b4afc0894d5cd9a6313df02ce53191b92d7fe59e
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Oct 5 10:01:09 2020 +0200
PHOENIX-6176 Set zookeeper as provided in phoenix-server
---
phoenix-server/pom.xml | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 1ce0bea..c90322a 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -111,7 +111,6 @@
This does *not* exclude transitive dependencies for
these. To exclude an entire "tree"
of dependencies, we need to mark those as "provided"
dependencies below. -->
<excludes>
- <exclude>org.apache.zookeeper:zookeeper</exclude>
<exclude>junit:junit</exclude>
<exclude>org.hamcrest:hamcrest-core</exclude>
<exclude>jline:jline</exclude>
@@ -399,6 +398,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<scope>provided</scope>
@@ -409,4 +413,23 @@
<scope>provided</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>phoenix-hbase-compat-2.3.0</id>
+ <!-- keep dependency plugin happy -->
+ <activation>
+ <property>
+ <name>hbase.profile</name>
+ <value>2.3</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper-jute</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
