This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.2 by this push:
new 2475b7b0de PHOENIX-7532 Update default Hbase 2.6 version to 2.6.2
(#2082)
2475b7b0de is described below
commit 2475b7b0de22b6adf0800e3dd77446db58aea31a
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Feb 27 14:37:39 2025 +0100
PHOENIX-7532 Update default Hbase 2.6 version to 2.6.2 (#2082)
---
pom.xml | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 69 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0456362d75..49543b4cba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<!-- Hadoop and Hbase-thirdparty version -->
<!-- These are expected to be overridden to conform to cluster versions
along with hbase.version (defined in profiles) -->
- <hadoop.version>3.3.6</hadoop.version>
+ <hadoop.version>3.4.1</hadoop.version>
<phoenix.thirdparty.version>2.1.0</phoenix.thirdparty.version>
<hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
@@ -86,7 +86,8 @@
<hbase-2.4.runtime.version>2.4.18</hbase-2.4.runtime.version>
<hbase-2.5.0.runtime.version>2.5.3-hadoop3</hbase-2.5.0.runtime.version>
<hbase-2.5.runtime.version>2.5.10-hadoop3</hbase-2.5.runtime.version>
- <hbase-2.6.runtime.version>2.6.1-hadoop3</hbase-2.6.runtime.version>
+ <hbase-2.6.0.runtime.version>2.6.1-hadoop3</hbase-2.6.0.runtime.version>
+ <hbase-2.6.runtime.version>2.6.2-hadoop3</hbase-2.6.runtime.version>
<compileSource>1.8</compileSource>
<maven.compiler.source>${compileSource}</maven.compiler.source>
@@ -746,6 +747,11 @@
<artifactId>phoenix-client-embedded-hbase-2.6</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-client-embedded-hbase-2.6.0</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-lite-hbase-2.4</artifactId>
@@ -761,6 +767,11 @@
<artifactId>phoenix-client-lite-hbase-2.5</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-client-lite-hbase-2.6.0</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-lite-hbase-2.6</artifactId>
@@ -781,6 +792,11 @@
<artifactId>phoenix-server-hbase-2.5</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-server-hbase-2.6.0</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-server-hbase-2.6</artifactId>
@@ -801,6 +817,11 @@
<artifactId>phoenix-mapreduce-byo-shaded-hbase-hbase-2.5</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-mapreduce-byo-shaded-hbase-hbase-2.6.0</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-mapreduce-byo-shaded-hbase-hbase-2.6</artifactId>
@@ -1191,7 +1212,31 @@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- HBase dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -1871,6 +1916,7 @@
<properties>
<hbase.profile>2.5</hbase.profile>
<hbase.compat.version>2.5.4</hbase.compat.version>
+ <hadoop.version>3.3.6</hadoop.version>
<hbase.version>${hbase-2.5.runtime.version}</hbase.version>
</properties>
</profile>
@@ -1902,6 +1948,7 @@
<properties>
<hbase.profile>2.5</hbase.profile>
<hbase.compat.version>2.5.4</hbase.compat.version>
+ <hadoop.version>3.3.6</hadoop.version>
<hbase.version>${hbase-2.5.runtime.version}</hbase.version>
</properties>
</profile>
@@ -1917,12 +1964,13 @@
<properties>
<hbase.profile>2.5.0</hbase.profile>
<hbase.compat.version>2.5.0</hbase.compat.version>
+ <hadoop.version>3.3.6</hadoop.version>
<hbase.version>${hbase-2.5.0.runtime.version}</hbase.version>
</properties>
</profile>
<profile>
<!-- This WILL work with the public -hadoop3 artifacts -->
- <id>phoenix-hbase-compat-2.6.0</id>
+ <id>phoenix-hbase-compat-2.6.2</id>
<activation>
<property>
<name>hbase.profile</name>
@@ -1931,10 +1979,27 @@
</activation>
<properties>
<hbase.profile>2.6</hbase.profile>
+ <!-- Same compat version as 2.6.0, but different Hadoop version -->
<hbase.compat.version>2.6.0</hbase.compat.version>
<hbase.version>${hbase-2.6.runtime.version}</hbase.version>
</properties>
</profile>
+ <profile>
+ <!-- This WILL work with the public -hadoop3 artifacts -->
+ <id>phoenix-hbase-compat-2.6.0</id>
+ <activation>
+ <property>
+ <name>hbase.profile</name>
+ <value>2.6.0</value>
+ </property>
+ </activation>
+ <properties>
+ <hbase.profile>2.6.0</hbase.profile>
+ <hbase.compat.version>2.6.0</hbase.compat.version>
+ <hadoop.version>3.3.6</hadoop.version>
+ <hbase.version>${hbase-2.6.0.runtime.version}</hbase.version>
+ </properties>
+ </profile>
<profile>
<id>owasp-dependency-check</id>
<activation>
