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
The following commit(s) were added to refs/heads/master by this push:
new cfc2914 PHOENIX-7538 Update to Hadoop 3.3.6 in Connectors (#150)
cfc2914 is described below
commit cfc291485417f5ed9118be85b7f20466a065557a
Author: Istvan Toth <[email protected]>
AuthorDate: Wed Mar 5 11:40:13 2025 +0100
PHOENIX-7538 Update to Hadoop 3.3.6 in Connectors (#150)
also add workaround for HADOOP-19164
---
phoenix5-spark/pom.xml | 11 +++++++++++
phoenix5-spark3/pom.xml | 9 +++++++++
pom.xml | 4 ++--
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 88f159f..fdd614d 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -431,6 +431,13 @@
<scope>test</scope>
</dependency>
+ <!-- Workaround for HADOOP-19164 -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- We want to take the implementation from Spark -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -471,6 +478,10 @@
<ignoredUnusedDeclaredDependency>
org.slf4j:slf4j-log4j12
</ignoredUnusedDeclaredDependency>
+ <!--Workaround for Hadoop bug -->
+ <ignoredUnsedDeclaredDependency>
+ org.mockito:mockito-core
+ </ignoredUnsedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
diff --git a/phoenix5-spark3/pom.xml b/phoenix5-spark3/pom.xml
index 7123e32..7f0dcc8 100644
--- a/phoenix5-spark3/pom.xml
+++ b/phoenix5-spark3/pom.xml
@@ -229,6 +229,12 @@
<scope>test</scope>
</dependency>
+ <!-- Workaround for HADOOP-19164 -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -302,6 +308,9 @@
<ignoredUnsedDeclaredDependency>org.apache.hbase:hbase-it</ignoredUnsedDeclaredDependency>
<ignoredUnsedDeclaredDependency>org.apache.hadoop:hadoop-minicluster</ignoredUnsedDeclaredDependency>
<ignoredUnsedDeclaredDependency>org.apache.omid:omid-tso-server</ignoredUnsedDeclaredDependency>
+
<ignoredUnsedDeclaredDependency>org.apache.omid:omid-tso-server</ignoredUnsedDeclaredDependency>
+ <!--Workaround for Hadoop bug -->
+
<ignoredUnsedDeclaredDependency>org.mockito:mockito-core</ignoredUnsedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index 87cf760..ddd941d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<!-- These should match the versions used to build HBase and Hadoop -->
<hbase.version>2.5.8-hadoop3</hbase.version>
<hbase.compat.version>2.5.0</hbase.compat.version>
- <hadoop.version>3.2.4</hadoop.version>
+ <hadoop.version>3.3.6</hadoop.version>
<zookeeper.version>3.8.4</zookeeper.version>
<hbase-thirdparty-version>4.1.5</hbase-thirdparty-version>
<!-- Hbase version dependent versions end -->
@@ -129,7 +129,7 @@
<commons-collections.version>3.2.2</commons-collections.version>
<commons-csv.version>1.0</commons-csv.version>
<findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
- <mockito-all.version>1.8.5</mockito-all.version>
+ <mockito-all.version>4.11.0</mockito-all.version>
<junit.version>4.13.2</junit.version>
<jodatime.version>2.10.5</jodatime.version>
<commons-cli.version>1.4</commons-cli.version>
