[FLINK-38222] Bump HBase version from 2.2 to 2.6 (#56)

Author: mateczagany

.github/workflows/push_pr.yml

@@ -28,8 +28,8 @@ jobs:
   compile_and_test:
     strategy:
       matrix:
-        flink: [ 1.20.0 ]
-        jdk: [ '8, 11' ]
+        flink: [ 1.20.2 ]
+        jdk: [ '8, 11, 17' ]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink }}

.github/workflows/weekly.yml

@@ -30,20 +30,17 @@ jobs:
     strategy:
       matrix:
         flink_branches: [{
-          flink: 1.20-SNAPSHOT,
+          flink: 1.20.2,
           branch: main
         }, {
-          flink: 1.19.1,
-          branch: v4.0
-        }, {
-          flink: 1.18.1,
+          flink: 1.19.3,
           branch: v4.0
         }]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
       flink_version: ${{ matrix.flink_branches.flink }}
       connector_branch: ${{ matrix.flink_branches.branch }}
-      jdk_version: ${{ matrix.flink_branches.jdk || '8, 11' }}
+      jdk_version: ${{ matrix.flink_branches.jdk || '8, 11, 17' }}
       run_dependency_convergence: false
       timeout_global: 120
       timeout_test: 80

docs/content.zh/docs/connectors/table/hbase.md

@@ -56,7 +56,7 @@ CREATE TABLE hTable (
  family3 ROW<q4 DOUBLE, q5 BOOLEAN, q6 STRING>,
  PRIMARY KEY (rowkey) NOT ENFORCED
 ) WITH (
- 'connector' = 'hbase-2.2',
+ 'connector' = 'hbase-2.6',
  'table-name' = 'mytable',
  'zookeeper.quorum' = 'localhost:2181'
 );
@@ -129,7 +129,7 @@ ON myTopic.key = hTable.rowkey;
       <td>String</td>
       <td>指定使用的连接器, 支持的值如下 :
         <ul>
-            <li><code>hbase-2.2</code>: 连接 HBase 2.2.x 集群</li>
+            <li><code>hbase-2.6</code>: 连接 HBase 2.6.x 集群</li>
         </ul>
       </td>
     </tr>
@@ -204,7 +204,7 @@ ON myTopic.key = hTable.rowkey;
       <td>可选</td>
       <td style="word-wrap: break-word;">false</td>
       <td>Boolean</td>
-      <td>是否启用异步查找。如果为真，查找将是异步的。注意：异步方式只支持 hbase-2.2 连接器</td>
+      <td>是否启用异步查找。如果为真，查找将是异步的。注意：异步方式只支持 hbase-2.6 连接器</td>
     </tr>
     <tr>
       <td><h5>lookup.cache</h5></td>

docs/content/docs/connectors/table/hbase.md

@@ -58,7 +58,7 @@ CREATE TABLE hTable (
  family3 ROW<q4 DOUBLE, q5 BOOLEAN, q6 STRING>,
  PRIMARY KEY (rowkey) NOT ENFORCED
 ) WITH (
- 'connector' = 'hbase-2.2',
+ 'connector' = 'hbase-2.6',
  'table-name' = 'mytable',
  'zookeeper.quorum' = 'localhost:2181'
 );
@@ -133,7 +133,7 @@ Connector Options
       <td>String</td>
       <td>Specify what connector to use, valid values are:
         <ul>
-            <li><code>hbase-2.2</code>: connect to HBase 2.2.x cluster</li>
+            <li><code>hbase-2.6</code>: connect to HBase 2.6.x cluster</li>
         </ul>
       </td>
     </tr>
@@ -225,7 +225,7 @@ Connector Options
       <td>no</td>
       <td style="word-wrap: break-word;">false</td>
       <td>Boolean</td>
-      <td>Whether async lookup are enabled. If true, the lookup will be async. Note, async only supports hbase-2.2 connector.</td>
+      <td>Whether async lookup are enabled. If true, the lookup will be async. Note, async only supports hbase-2.6 connector.</td>
     </tr>
     <tr>
       <td><h5>lookup.cache</h5></td>

flink-connector-hbase-2.2/archunit-violations/346fff47-b126-4f8c-ba73-799d99856912 renamed to flink-connector-hbase-2.6/archunit-violations/346fff47-b126-4f8c-ba73-799d99856912

@@ -28,8 +28,8 @@ under the License.
 		<version>4.0-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>flink-connector-hbase-2.2</artifactId>
-	<name>Flink : Connectors : HBase 2.2</name>
+	<artifactId>flink-connector-hbase-2.6</artifactId>
+	<name>Flink : Connectors : HBase 2.6</name>
 	<packaging>jar</packaging>
 
 	<dependencies>
@@ -91,6 +91,14 @@ under the License.
 					<groupId>net.minidev</groupId>
 					<artifactId>json-smart</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>logback-classic</artifactId>
+					<groupId>ch.qos.logback</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -171,18 +179,25 @@ under the License.
 			</exclusions>
 		</dependency>
 
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-all</artifactId>
-		</dependency>
-
 		<!-- Tests -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.objenesis</groupId>
+					<artifactId>objenesis</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.flink</groupId>
 			<artifactId>flink-connector-hbase-base</artifactId>
@@ -270,6 +285,18 @@ under the License.
 					<groupId>org.javassist</groupId>
 					<artifactId>javassist</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-reload4j</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.errorprone</groupId>
+					<artifactId>error_prone_annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -362,13 +389,29 @@ under the License.
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-minicluster</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.hadoop</groupId>
 			<artifactId>hadoop-hdfs</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>servlet-api</artifactId>
+					<groupId>javax.servlet</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-cli</groupId>
+					<artifactId>commons-cli</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- ArchUit test dependencies -->

flink-connector-hbase-2.2/archunit-violations/ac3990d6-8d39-4299-8765-3ae2f91d76af renamed to flink-connector-hbase-2.6/archunit-violations/ac3990d6-8d39-4299-8765-3ae2f91d76af

@@ -66,7 +66,7 @@
 public class HBase2DynamicTableFactory
         implements DynamicTableSourceFactory, DynamicTableSinkFactory {
 
-    private static final String IDENTIFIER = "hbase-2.2";
+    private static final String IDENTIFIER = "hbase-2.6";
 
     @Override
     public DynamicTableSource createDynamicTableSource(Context context) {