[FLINK-35136] Bump connector version to 4.0, adapt CI workflows
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index f6ffd1e..6105f80 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -28,10 +28,11 @@
compile_and_test:
strategy:
matrix:
- flink: [1.16.3, 1.17.2, 1.18.0, 1.19-SNAPSHOT]
+ flink: [ 1.18.1, 1.19.1 ]
+ jdk: [ '8, 11' ]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
flink_version: ${{ matrix.flink }}
+ jdk_version: ${{ matrix.jdk }}
timeout_global: 120
timeout_test: 80
-
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index ee9bd24..15a49fb 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -19,7 +19,7 @@
# We need to specify repo related information here since Apache INFRA doesn't differentiate
# between several workflows with the same names while preparing a report for GHA usage
# https://infra-reports.apache.org/#ghactions
-name: Weekly Flink Connector HBase
+name: Weekly Flink Connector HBase CI
on:
schedule:
- cron: "0 0 * * 0"
@@ -30,28 +30,23 @@
strategy:
matrix:
flink_branches: [{
- flink: 1.16.3,
- branch: v3.0
+ flink: 1.19-SNAPSHOT,
+ branch: main
+ }, {
+ flink: 1.18-SNAPSHOT,
+ branch: main
}, {
flink: 1.17.2,
branch: v3.0
}, {
- flink: 1.16-SNAPSHOT,
- branch: main
- }, {
- flink: 1.17-SNAPSHOT,
- branch: main
- },{
- flink: 1.18-SNAPSHOT,
- branch: main
- }, {
- flink: 1.19-SNAPSHOT,
- branch: main
+ flink: 1.16.3,
+ branch: v3.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' }}
run_dependency_convergence: false
timeout_global: 120
timeout_test: 80
diff --git a/flink-connector-hbase-2.2/pom.xml b/flink-connector-hbase-2.2/pom.xml
index 0bc9ba3..c07f180 100644
--- a/flink-connector-hbase-2.2/pom.xml
+++ b/flink-connector-hbase-2.2/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-hbase-2.2</artifactId>
diff --git a/flink-connector-hbase-base/pom.xml b/flink-connector-hbase-base/pom.xml
index f50d309..ac217ef 100644
--- a/flink-connector-hbase-base/pom.xml
+++ b/flink-connector-hbase-base/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-hbase-base</artifactId>
diff --git a/flink-connector-hbase-e2e-tests/pom.xml b/flink-connector-hbase-e2e-tests/pom.xml
index 5efb3a6..e37f7fc 100644
--- a/flink-connector-hbase-e2e-tests/pom.xml
+++ b/flink-connector-hbase-e2e-tests/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
</parent>
<artifactId>flink-connector-hbase-e2e-tests</artifactId>
diff --git a/flink-sql-connector-hbase-2.2/pom.xml b/flink-sql-connector-hbase-2.2/pom.xml
index ff3ac77..8d60df3 100644
--- a/flink-sql-connector-hbase-2.2/pom.xml
+++ b/flink-sql-connector-hbase-2.2/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
</parent>
<artifactId>flink-sql-connector-hbase-2.2</artifactId>
diff --git a/pom.xml b/pom.xml
index 967aedc..6445579 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,8 @@
<version>1.1.0</version>
</parent>
- <groupId>org.apache.flink</groupId>
<artifactId>flink-connector-hbase-parent</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>4.0-SNAPSHOT</version>
<name>Flink : Connectors : HBase Parent</name>
<packaging>pom</packaging>
@@ -53,7 +52,7 @@
</scm>
<properties>
- <flink.version>1.16.3</flink.version>
+ <flink.version>1.18.1</flink.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.7</scala.version>