This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit cad3538de278d4ade4f20b5de57a008e3e223e4c 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 remove duplicate dependency --- 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 63ffdf7..e5e530a 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 d6a83ac..0071dc6 100644 --- a/phoenix-client-parent/pom.xml +++ b/phoenix-client-parent/pom.xml @@ -280,6 +280,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.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>runtime</scope> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 4fc0711..7395219 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -230,6 +230,7 @@ <dependency> <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId> + <optional>true</optional> </dependency> <!-- Hadoop dependencies --> <dependency> diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index fd80e87..9c15eca 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -288,6 +288,11 @@ <groupId>org.apache.phoenix</groupId> <artifactId>phoenix-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId> + <optional>false</optional> + </dependency> <!-- hbase's classpath will provide these, mark them as provided to prevent them, and their transitive dependencies, from being included in the shaded jar. -->