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


The following commit(s) were added to refs/heads/5.1 by this push:
     new 0ebbc9d3f6 PHOENIX-7539 Update default HBase 2.5 version to 2.5.11 
(#2086) (#2268)
0ebbc9d3f6 is described below

commit 0ebbc9d3f61846ff98b2303dfe8189b4965df5bd
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Aug 7 10:29:22 2025 +0200

    PHOENIX-7539 Update default HBase 2.5 version to 2.5.11 (#2086) (#2268)
    
    we've already updated 5.1 to 2.5.12, but we did not add the required new 
profile
    this backport fixes the breakage caused by the previous incomplete update
---
 pom.xml | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index f6d1b254f1..10ae8c2dc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
     <hbase-2.4.0.runtime.version>2.4.0</hbase-2.4.0.runtime.version>
     <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.4.runtime.version>2.5.10-hadoop3</hbase-2.5.4.runtime.version>
     <hbase-2.5.runtime.version>2.5.12-hadoop3</hbase-2.5.runtime.version>
 
     <compileSource>1.8</compileSource>
@@ -256,6 +257,11 @@
         <artifactId>phoenix-client-hbase-2.5.0</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.phoenix</groupId>
+        <artifactId>phoenix-client-hbase-2.5.4</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix-client-hbase-2.5</artifactId>
@@ -291,6 +297,11 @@
         <artifactId>phoenix-client-embedded-hbase-2.5.0</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.phoenix</groupId>
+        <artifactId>phoenix-client-embedded-hbase-2.5.4</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix-client-embedded-hbase-2.5</artifactId>
@@ -326,6 +337,11 @@
         <artifactId>phoenix-server-hbase-2.5.0</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.phoenix</groupId>
+        <artifactId>phoenix-server-hbase-2.5.4</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.phoenix</groupId>
         <artifactId>phoenix-server-hbase-2.5</artifactId>
@@ -1866,9 +1882,9 @@
     <!-- The dependencies should be defined only in phoenix-core
     ,but maven doesn't seem to support that -->
     <profile>
-      <!-- must be identical to phoenix-hbase-compat-2.5.4 profile -->
-      <!-- This will work with the public HBase artifacts -->
-      <id>phoenix-hbase-compat-2.5.4-default</id>
+      <!-- must be identical to phoenix-hbase-compat-2.5.12 profile -->
+      <!-- This WILL work with the public HBase artifacts -->
+      <id>phoenix-hbase-compat-2.5.12-default</id>
       <activation>
         <property>
           <name>!hbase.profile</name>
@@ -1877,7 +1893,7 @@
       <properties>
         <hbase.profile>2.5</hbase.profile>
         <hbase.compat.version>2.5.4</hbase.compat.version>
-        <hadoop.version>3.2.4</hadoop.version>
+        <hadoop.version>3.4.1</hadoop.version>
         <hbase.version>${hbase-2.5.runtime.version}</hbase.version>
         <zookeeper.version>3.8.4</zookeeper.version>
         <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>
@@ -1998,13 +2014,31 @@
       <activation>
         <property>
           <name>hbase.profile</name>
-          <value>2.5</value>
+          <value>2.5.4</value>
         </property>
       </activation>
       <properties>
         <hbase.profile>2.5</hbase.profile>
         <hbase.compat.version>2.5.4</hbase.compat.version>
         <hadoop.version>3.2.4</hadoop.version>
+        <hbase.version>${hbase-2.5.4.runtime.version}</hbase.version>
+        <zookeeper.version>3.8.4</zookeeper.version>
+        <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>
+      </properties>
+    </profile>
+    <profile>
+      <!-- This WILL work with the public -hadoop3 artifacts -->
+      <id>phoenix-hbase-compat-2.5.12</id>
+      <activation>
+        <property>
+          <name>hbase.profile</name>
+          <value>2.5</value>
+        </property>
+      </activation>
+      <properties>
+        <hbase.profile>2.5</hbase.profile>
+        <hadoop.version>3.4.1</hadoop.version>
+        <hbase.compat.version>2.5.4</hbase.compat.version>
         <hbase.version>${hbase-2.5.runtime.version}</hbase.version>
         <zookeeper.version>3.8.4</zookeeper.version>
         <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>

Reply via email to