You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2023/11/30 11:26:54 UTC
(phoenix-connectors) 01/07: PHOENIX-7122 Build connectors with Hbase 2.4
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-connectors.git
commit b2a283a3b2e2b1d2d11dcecf594f9d8c10e3cec2
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Nov 23 08:13:54 2023 +0100
PHOENIX-7122 Build connectors with Hbase 2.4
also update apache parent to 31, and fix some dependency issues found by the newer maven-dependency-plugin
---
phoenix5-hive/pom.xml | 21 +++++++++++++++------
phoenix5-spark/pom.xml | 8 ++++++++
phoenix5-spark3-it/pom.xml | 8 ++++++++
pom.xml | 17 ++++++++---------
4 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/phoenix5-hive/pom.xml b/phoenix5-hive/pom.xml
index 25f90ae..bd23b41 100644
--- a/phoenix5-hive/pom.xml
+++ b/phoenix5-hive/pom.xml
@@ -197,19 +197,25 @@
<scope>provided</scope>
</dependency>
+ <!-- Test dependencies -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
+ <scope>test</scope>
</dependency>
-
- <!-- Test dependencies -->
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-core</artifactId>
@@ -385,13 +391,16 @@
</ignoredUnusedDeclaredDependencies>
<ignoredUsedUndeclaredDependencies>
<!-- I couldn't find it referenced anywhere in the phoenix-hive codebase -->
- <ignoredUsedUndeclaredDependency>
- com.google.code.findbugs:jsr305
- </ignoredUsedUndeclaredDependency>
<ignoredUsedUndeclaredDependency>
org.apache.calcite.avatica:avatica
</ignoredUsedUndeclaredDependency>
+ <ignoredUnusedDeclaredDependency>
+ org.antlr:antlr-runtime
+ </ignoredUnusedDeclaredDependency>
</ignoredUsedUndeclaredDependencies>
+ <ignoredNonTestScopedDependencies>
+ org.antlr:antlr-runtime
+ </ignoredNonTestScopedDependencies>
</configuration>
</plugin>
<plugin>
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 7b26396..cd33ca3 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -401,6 +401,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <!-- Why is this not provided transitively via Phoenix ? -->
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Mark every Hadoop jar as provided -->
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/phoenix5-spark3-it/pom.xml b/phoenix5-spark3-it/pom.xml
index 37f9ca8..3d8c25b 100644
--- a/phoenix5-spark3-it/pom.xml
+++ b/phoenix5-spark3-it/pom.xml
@@ -130,6 +130,13 @@
</dependency>
<!-- Minicluster dependencies -->
+ <dependency>
+ <!-- Why is this not provided transitively via Phoenix ? -->
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-it</artifactId>
@@ -233,6 +240,7 @@
<ignoredDependency>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</ignoredDependency>
<ignoredDependency>org.apache.hbase:hbase-it</ignoredDependency>
<ignoredDependency>org.apache.omid:*</ignoredDependency>
+ <ignoredDependency>org.apache.zookeeper:zookeeper</ignoredDependency>
</ignoredDependencies>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index a415667..b795ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>31</version>
</parent>
<scm>
@@ -58,14 +58,13 @@
<phoenix.version>5.1.3</phoenix.version>
<omid.version>1.0.2</omid.version>
<phoenix.thirdparty.version>2.0.0</phoenix.thirdparty.version>
- <!-- Hadoop Versions -->
- <hbase.version>2.1.10</hbase.version>
- <hbase.compat.version>2.1.6</hbase.compat.version>
- <hadoop.version>3.0.3</hadoop.version>
- <zookeeper.version>3.5.9</zookeeper.version>
-
- <hbase-thirdparty-version>2.1.0</hbase-thirdparty-version>
-
+ <!-- The should match the versions used to build HBase and Hadoop -->
+ <hbase.version>2.4.16</hbase.version>
+ <hbase.compat.version>2.4.1</hbase.compat.version>
+ <hadoop.version>3.1.2</hadoop.version>
+ <zookeeper.version>3.5.7</zookeeper.version>
+ <hbase-thirdparty-version>4.1.4</hbase-thirdparty-version>
+ <!-- Hbase version dependent versions end -->
<!-- General Properties -->
<test.output.tofile>true</test.output.tofile>