[incubator-streampark] branch dev-2.1.2 updated: [feature] support huawei flink (#2832)

[be...@apache.org]

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

benjobs pushed a commit to branch dev-2.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.2 by this push:
     new 4c98e06d6 [feature] support huawei flink (#2832)
4c98e06d6 is described below

commit 4c98e06d6641d8e9e575ecff2872c590efa12892
Author: zhoulii <zh...@foxmail.com>
AuthorDate: Wed Jul 5 14:26:36 2023 +0800

    [feature] support huawei flink (#2832)
    
    Co-authored-by: zhoulii <zh...@hikvision.com.cn>
---
 .../main/scala/org/apache/streampark/common/conf/FlinkVersion.scala  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala b/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
index e2182c650..3dd78d51e 100644
--- a/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
+++ b/streampark-common/src/main/scala/org/apache/streampark/common/conf/FlinkVersion.scala
@@ -32,10 +32,11 @@ class FlinkVersion(val flinkHome: String) extends java.io.Serializable with Logg
 
   private[this] lazy val FLINK_VER_PATTERN = Pattern.compile("^(\\d+\\.\\d+)(\\.)?.*$")
 
-  private[this] lazy val FLINK_VERSION_PATTERN = Pattern.compile("^Version: (.*), Commit ID: (.*)$")
+  private[this] lazy val FLINK_VERSION_PATTERN =
+    Pattern.compile("^Version: (\\d+\\.\\d+\\.\\d+).*, Commit ID: (.*)$")
 
   private[this] lazy val FLINK_SCALA_VERSION_PATTERN =
-    Pattern.compile("^flink-dist_(.*)-[0-9].*.jar$")
+    Pattern.compile("^flink-dist_(\\d\\.\\d+).*.jar$")
 
   lazy val scalaVersion: String = {
     val matcher = FLINK_SCALA_VERSION_PATTERN.matcher(flinkDistJar.getName)