[phoenix] branch 4.x updated: PHOENIX-5883 Add HBase 1.6 compatibility module to 4.x branch

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x by this push:
     new a3fe84f  PHOENIX-5883 Add HBase 1.6 compatibility module to 4.x branch
a3fe84f is described below

commit a3fe84f834bfab1d8f0d92716bdadac26888ab21
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu May 7 16:30:57 2020 +0200

    PHOENIX-5883 Add HBase 1.6 compatibility module to 4.x branch
    
    it doesn't actually add a new module, as the 1.5 module is working with 1.6
---
 .../it/resources/compatible_client_versions.json   |  3 ++-
 pom.xml                                            | 24 +++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/phoenix-core/src/it/resources/compatible_client_versions.json b/phoenix-core/src/it/resources/compatible_client_versions.json
index 8308f17..ebab316 100644
--- a/phoenix-core/src/it/resources/compatible_client_versions.json
+++ b/phoenix-core/src/it/resources/compatible_client_versions.json
@@ -19,5 +19,6 @@
     "_comment": "Lists all phoenix compatible client versions against the current branch version for a given hbase profile If hbase profile is 1.3, phoenix client versions 4.14.3 and 4.15.0 are tested against current branch version",
     "1.3": ["4.14.3", "4.15.0"],
     "1.4": ["4.14.3", "4.15.0"],
-    "1.5": ["4.15.0"]
+    "1.5": ["4.15.0"],
+    "1.6": []
 }
diff --git a/pom.xml b/pom.xml
index c19e963..08c4959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -405,7 +405,7 @@
 
                    hbaseMajor == 1 &amp;&amp; (
                      ("${hbase.compat.version}".equals("1.5.0")
-                       &amp;&amp; hbaseMinor == 5)
+                       &amp;&amp; (hbaseMinor == 5 || hbaseMinor == 6))
                      || ("${hbase.compat.version}".equals("1.4.0")
                        &amp;&amp; hbaseMinor == 4)
                      || ("${hbase.compat.version}".equals("1.3.0")
@@ -1160,6 +1160,28 @@
       </properties>
     </profile>
     <profile>
+      <id>phoenix-hbase-compat-1.6.0</id>
+      <activation>
+        <property>
+          <name>hbase.profile</name>
+          <value>1.6</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.phoenix</groupId>
+          <artifactId>phoenix-hbase-compat-1.5.0</artifactId>
+        </dependency>
+      </dependencies>
+      <properties>
+        <!-- We are using the 1.5 compat module for 1.6 -->
+        <hbase.profile>1.6</hbase.profile>
+        <hadoop-two.version>2.8.5</hadoop-two.version>
+        <hbase.compat.version>1.5.0</hbase.compat.version>
+        <hbase.version>1.6.0</hbase.version>
+      </properties>
+    </profile>
+    <profile>
       <id>phoenix-hbase-compat-1.5.0</id>
       <activation>
         <property>