From 6dfe4f4848ca3f7ef8a8c7da8c4aee4dc18a4af1 Mon Sep 17 00:00:00 2001
From: Yubin Li <lixin58688@163.com>
Date: Tue, 31 Oct 2023 13:17:01 +0100
Subject: [PATCH] [FLINK-33379] Bump Flink version on
 flink-connector-elasticsearch to include 1.18 support. This closes #78

* [FLINK-33379] Bump Flink version on flink-connector-elasticsearch to include 1.18 support.

* pin commons-compress and snappy-java version

* update weekly.yml

(cherry picked from commit 6636b62528a63a11b9aee3d6408ec3c440904096)
---
 .github/workflows/push_pr.yml |  7 +++++--
 .github/workflows/weekly.yml  | 23 +++++++++++++++++++++--
 pom.xml                       | 14 ++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 89ea3fba..12eb9290 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -16,13 +16,16 @@
 # limitations under the License.
 ################################################################################
 
-name: Build flink-connector-elasticsearch
+name: CI
 on: [push, pull_request]
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
   compile_and_test:
+    strategy:
+      matrix:
+        flink: [1.16.2, 1.17.1, 1.18.0, 1.19-SNAPSHOT]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
-      flink_version: 1.16.2
+      flink_version: ${{ matrix.flink }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 9d34bc1b..f5b46f00 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -26,8 +26,27 @@ jobs:
     if: github.repository_owner == 'apache'
     strategy:
       matrix:
-        flink: [1.16-SNAPSHOT, 1.17-SNAPSHOT]
+        flink_branches: [{
+          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.2,
+          branch: v3.0
+        }, {
+          flink: 1.17.1,
+          branch: v3.0
+        }]
     uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
     with:
-      flink_version: ${{ matrix.flink }}
+      flink_version: ${{ matrix.flink_branches.flink }}
+      connector_branch: ${{ matrix.flink_branches.branch }}
       run_dependency_convergence: false
diff --git a/pom.xml b/pom.xml
index 4c56023d..d87f7c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,6 +277,20 @@ under the License.
 				<version>${log4j.version}</version>
 			</dependency>
 
+			<!-- For dependency convergence  -->
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>1.24.0</version>
+			</dependency>
+
+			<!-- For dependency convergence  -->
+			<dependency>
+				<groupId>org.xerial.snappy</groupId>
+				<artifactId>snappy-java</artifactId>
+				<version>1.1.10.4</version>
+			</dependency>
+
 			<!-- For dependency convergence -->
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>