This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch 2.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit 2c65e450aff3da478a8b0f9530914cec33008b74 Author: benjobs <[email protected]> AuthorDate: Sat May 13 22:22:04 2023 +0800 [Bug] 2.1.0 bug fixed --- build.sh | 2 +- deploy/helm/streampark/Chart.yaml | 4 ++-- deploy/helm/streampark/values.yaml | 2 +- pom.xml | 2 +- streampark-common/pom.xml | 2 +- .../main/scala/org/apache/streampark/common/conf/ConfigConst.scala | 2 +- streampark-console/pom.xml | 2 +- streampark-console/streampark-console-service/pom.xml | 2 +- .../streampark-console-service/src/main/assembly/bin/streampark.sh | 2 +- .../java/org/apache/streampark/console/base/config/OpenapiConfig.java | 2 +- streampark-flink/pom.xml | 2 +- streampark-flink/streampark-flink-client/pom.xml | 2 +- .../streampark-flink-client/streampark-flink-client-api/pom.xml | 2 +- .../streampark-flink-client/streampark-flink-client-core/pom.xml | 2 +- .../org/apache/streampark/flink/client/trait/FlinkClientTrait.scala | 2 -- streampark-flink/streampark-flink-connector/pom.xml | 2 +- .../streampark-flink-connector-base/pom.xml | 2 +- .../streampark-flink-connector-clickhouse/pom.xml | 2 +- .../streampark-flink-connector-doris/pom.xml | 2 +- .../streampark-flink-connector-elasticsearch/pom.xml | 2 +- .../streampark-flink-connector-elasticsearch5/pom.xml | 2 +- .../streampark-flink-connector-elasticsearch6/pom.xml | 2 +- .../streampark-flink-connector-elasticsearch7/pom.xml | 2 +- .../streampark-flink-connector-hbase/pom.xml | 2 +- .../streampark-flink-connector-http/pom.xml | 2 +- .../streampark-flink-connector-influx/pom.xml | 2 +- .../streampark-flink-connector-jdbc/pom.xml | 2 +- .../streampark-flink-connector-kafka/pom.xml | 2 +- .../streampark-flink-connector-mongo/pom.xml | 2 +- .../streampark-flink-connector-redis/pom.xml | 2 +- streampark-flink/streampark-flink-core/pom.xml | 2 +- streampark-flink/streampark-flink-kubernetes/pom.xml | 2 +- .../streampark/flink/kubernetes/ingress/IngressController.scala | 4 +++- streampark-flink/streampark-flink-packer/pom.xml | 2 +- streampark-flink/streampark-flink-proxy/pom.xml | 2 +- streampark-flink/streampark-flink-shims/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims-base/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims-test/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml | 2 +- .../streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml | 2 +- streampark-flink/streampark-flink-sqlclient/pom.xml | 2 +- streampark-flink/streampark-flink-udf/pom.xml | 2 +- streampark-shaded/pom.xml | 2 +- streampark-spark/pom.xml | 2 +- streampark-spark/streampark-spark-cli/pom.xml | 2 +- streampark-spark/streampark-spark-connector/pom.xml | 2 +- .../streampark-spark-connector-base/pom.xml | 2 +- .../streampark-spark-connector-kafka/pom.xml | 2 +- streampark-spark/streampark-spark-core/pom.xml | 2 +- streampark-storage/pom.xml | 2 +- 54 files changed, 56 insertions(+), 56 deletions(-) diff --git a/build.sh b/build.sh index 15afa6a01..9f697a929 100755 --- a/build.sh +++ b/build.sh @@ -116,7 +116,7 @@ print_logo() { printf ' %s ___/ / /_/ / / __/ /_/ / / / / / / /_/ / /_/ / / / ,< %s\n' $PRIMARY $RESET printf ' %s /____/\__/_/ \___/\__,_/_/ /_/ /_/ ____/\__,_/_/ /_/|_| %s\n' $PRIMARY $RESET printf ' %s /_/ %s\n\n' $PRIMARY $RESET - printf ' %s Version: 2.1.0 %s\n' $BLUE $RESET + printf ' %s Version: 2.1.1 %s\n' $BLUE $RESET printf ' %s WebSite: https://streampark.apache.org%s\n' $BLUE $RESET printf ' %s GitHub : http://github.com/apache/streampark%s\n\n' $BLUE $RESET printf ' %s ──────── Apache StreamPark, Make stream processing easier ô~ô!%s\n\n' $PRIMARY $RESET diff --git a/deploy/helm/streampark/Chart.yaml b/deploy/helm/streampark/Chart.yaml index f7c52fbcc..6ee31d5d7 100644 --- a/deploy/helm/streampark/Chart.yaml +++ b/deploy/helm/streampark/Chart.yaml @@ -20,5 +20,5 @@ description: A Helm chart for the Apache StreamPark home: https://streampark.apache.org icon: https://streampark.apache.org/image/logo_name.png type: application -version: 2.1.0 -appVersion: 2.1.0 +version: 2.1.1 +appVersion: 2.1.1 diff --git a/deploy/helm/streampark/values.yaml b/deploy/helm/streampark/values.yaml index 0122e29ce..3bf195953 100644 --- a/deploy/helm/streampark/values.yaml +++ b/deploy/helm/streampark/values.yaml @@ -23,7 +23,7 @@ timezone: "Asia/Shanghai" image: repository: "apache/streampark" pullPolicy: "IfNotPresent" - tag: "2.1.0" + tag: "2.1.1" pullSecret: "" rbac: diff --git a/pom.xml b/pom.xml index 372fc054b..24766fe14 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> <packaging>pom</packaging> <name>StreamPark Project Parent POM</name> diff --git a/streampark-common/pom.xml b/streampark-common/pom.xml index bcc174bca..5652fa824 100644 --- a/streampark-common/pom.xml +++ b/streampark-common/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-common_${scala.binary.version}</artifactId> diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala index 095078e81..b641a86db 100644 --- a/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala +++ b/streampark-common/src/main/scala/org/apache/streampark/common/conf/ConfigConst.scala @@ -201,7 +201,7 @@ object ConfigConst { println(" ___/ / /_/ / / __/ /_/ / / / / / / /_/ / /_/ / / / ,< ") println(" /____/\\__/_/ \\___/\\__,_/_/ /_/ /_/ ____/\\__,_/_/ /_/|_| ") println(" /_/ \n\n") - println(" Version: 2.1.0 ") + println(" Version: 2.1.1 ") println(" WebSite: https://streampark.apache.org ") println(" GitHub : https://github.com/apache/incubator-streampark ") println(s" Info : $info ") diff --git a/streampark-console/pom.xml b/streampark-console/pom.xml index e782573d5..a65d32b1e 100644 --- a/streampark-console/pom.xml +++ b/streampark-console/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-console</artifactId> diff --git a/streampark-console/streampark-console-service/pom.xml b/streampark-console/streampark-console-service/pom.xml index c2b1181cf..0f6971d3c 100644 --- a/streampark-console/streampark-console-service/pom.xml +++ b/streampark-console/streampark-console-service/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-console</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-console-service</artifactId> diff --git a/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh index 3d29b0cc4..84f40cec5 100755 --- a/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh +++ b/streampark-console/streampark-console-service/src/main/assembly/bin/streampark.sh @@ -271,7 +271,7 @@ print_logo() { printf ' %s ___/ / /_/ / / __/ /_/ / / / / / / /_/ / /_/ / / / ,< %s\n' $PRIMARY $RESET printf ' %s /____/\__/_/ \___/\__,_/_/ /_/ /_/ ____/\__,_/_/ /_/|_| %s\n' $PRIMARY $RESET printf ' %s /_/ %s\n\n' $PRIMARY $RESET - printf ' %s Version: 2.1.0 %s\n' $BLUE $RESET + printf ' %s Version: 2.1.1 %s\n' $BLUE $RESET printf ' %s WebSite: https://streampark.apache.org%s\n' $BLUE $RESET printf ' %s GitHub : http://github.com/apache/streampark%s\n\n' $BLUE $RESET printf ' %s ──────── Apache StreamPark, Make stream processing easier ô~ô!%s\n\n' $PRIMARY $RESET diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java index 36a6d2574..f2fe408c5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/config/OpenapiConfig.java @@ -52,7 +52,7 @@ public class OpenapiConfig implements WebMvcConfigurer { .name("Apache StreamPark") .url("https://streampark.apache.org/";) .email("[email protected]")) - .version("2.1.0") + .version("2.1.1") .license(new License().name("Apache-2.0 license"))) .components( new Components() diff --git a/streampark-flink/pom.xml b/streampark-flink/pom.xml index 1ac2d2142..a248a2e6e 100644 --- a/streampark-flink/pom.xml +++ b/streampark-flink/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink</artifactId> diff --git a/streampark-flink/streampark-flink-client/pom.xml b/streampark-flink/streampark-flink-client/pom.xml index b8a9efc7e..d26ced1ac 100644 --- a/streampark-flink/streampark-flink-client/pom.xml +++ b/streampark-flink/streampark-flink-client/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-client</artifactId> diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml index 7c4ba3641..448eb0708 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-client</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-client-api_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml b/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml index 77a9c6094..f99f3b0fa 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-client</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-client-core_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala index dca2863cc..325bc9ff3 100644 --- a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala +++ b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/FlinkClientTrait.scala @@ -40,7 +40,6 @@ import org.apache.flink.util.FlinkException import org.apache.flink.util.Preconditions.checkNotNull import java.io.File -import java.lang.{Boolean => JavaBool} import java.util.{Collections, List => JavaList, Map => JavaMap} import scala.annotation.tailrec @@ -99,7 +98,6 @@ trait FlinkClientTrait extends Logger { .safeSet(ApplicationConfiguration.APPLICATION_MAIN_CLASS, submitRequest.appMain) .safeSet(ApplicationConfiguration.APPLICATION_ARGS, extractProgramArgs(submitRequest)) .safeSet(PipelineOptionsInternal.PIPELINE_FIXED_JOB_ID, submitRequest.jobId) - .safeSet(WebOptions.CANCEL_ENABLE, JavaBool.FALSE) if ( !submitRequest.properties.containsKey(CheckpointingOptions.MAX_RETAINED_CHECKPOINTS.key()) diff --git a/streampark-flink/streampark-flink-connector/pom.xml b/streampark-flink/streampark-flink-connector/pom.xml index 246b202c8..957eb5e61 100644 --- a/streampark-flink/streampark-flink-connector/pom.xml +++ b/streampark-flink/streampark-flink-connector/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml index b80a73985..9f6a8484e 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-base/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-base_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml index e5b3e2ac1..9d3749fae 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-clickhouse/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-clickhouse_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml index 05baf05db..813507bff 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-doris/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-doris_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/pom.xml index d3a133198..da9aa0ace 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-elasticsearch</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml index 349548fd0..eb67a8254 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch5/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector-elasticsearch</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-elasticsearch5_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml index a9e018f19..80e3f886f 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch6/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector-elasticsearch</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-elasticsearch6_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml index 097f177b3..38551ca2d 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-elasticsearch/streampark-flink-connector-elasticsearch7/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>streampark-flink-connector-elasticsearch</artifactId> <groupId>org.apache.streampark</groupId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-elasticsearch7_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml index 14e50d106..3e8075a07 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-hbase/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-hbase_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml index 26653c526..269094e48 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-http/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-http_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml index f95076a6d..e8f44795c 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-influx/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-influx_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml index 77733af25..0cc7e3047 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-jdbc/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-jdbc_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml index 2d21f587a..d7270ebce 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-kafka/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-kafka_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml index eff0e0ed5..a00a872e1 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-mongo/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-mongo_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml b/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml index 20e789d82..e4cef13af 100644 --- a/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml +++ b/streampark-flink/streampark-flink-connector/streampark-flink-connector-redis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-connector</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-connector-redis_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-core/pom.xml b/streampark-flink/streampark-flink-core/pom.xml index 32efcfc3c..9ed42512a 100644 --- a/streampark-flink/streampark-flink-core/pom.xml +++ b/streampark-flink/streampark-flink-core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-core_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-kubernetes/pom.xml b/streampark-flink/streampark-flink-kubernetes/pom.xml index 9a2ef31a8..a18ec4ab8 100644 --- a/streampark-flink/streampark-flink-kubernetes/pom.xml +++ b/streampark-flink/streampark-flink-kubernetes/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-kubernetes_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressController.scala b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressController.scala index c636010b6..e06ae5fac 100644 --- a/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressController.scala +++ b/streampark-flink/streampark-flink-kubernetes/src/main/scala/org/apache/streampark/flink/kubernetes/ingress/IngressController.scala @@ -27,11 +27,13 @@ import scala.language.postfixOps object IngressController extends Logger { + private[this] val VERSION_REGEXP = "(\\d+\\.\\d+)".r + private lazy val ingressStrategy: IngressStrategy = { using(new DefaultKubernetesClient()) { client => val versionInfo = client.getVersion - val version = s"${versionInfo.getMajor}.${versionInfo.getMinor}".toDouble + val version = VERSION_REGEXP.findFirstIn(client.getVersion.getGitVersion).get.toDouble if (version >= 1.19) { new IngressStrategyV1() } else { diff --git a/streampark-flink/streampark-flink-packer/pom.xml b/streampark-flink/streampark-flink-packer/pom.xml index 97ed93547..65eb2dcef 100644 --- a/streampark-flink/streampark-flink-packer/pom.xml +++ b/streampark-flink/streampark-flink-packer/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-packer_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-proxy/pom.xml b/streampark-flink/streampark-flink-proxy/pom.xml index 5a6dd9d83..fdd0a8649 100644 --- a/streampark-flink/streampark-flink-proxy/pom.xml +++ b/streampark-flink/streampark-flink-proxy/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-proxy_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/pom.xml b/streampark-flink/streampark-flink-shims/pom.xml index 685994023..2205fc79d 100644 --- a/streampark-flink/streampark-flink-shims/pom.xml +++ b/streampark-flink/streampark-flink-shims/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml index 86d566aad..155babd52 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims-base/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims-base_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml index b7167fb48..cf778c6b9 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims-test/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims-test_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml index 8c3d29bc3..4954ed16e 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.12/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims_flink-1.12_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml index 67e9bce50..a15e80f87 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.13/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims_flink-1.13_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml index f75fc0050..e271794a6 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.14/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims_flink-1.14_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml index 8cec914d9..f17fb7a77 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.15/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims_flink-1.15_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml index f8f6cecd6..bc737c052 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.16/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims_flink-1.16_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml index 68286ae99..f7dca127d 100644 --- a/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml +++ b/streampark-flink/streampark-flink-shims/streampark-flink-shims_flink-1.17/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink-shims</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-shims_flink-1.17_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-sqlclient/pom.xml b/streampark-flink/streampark-flink-sqlclient/pom.xml index 58892b026..8df5deb30 100644 --- a/streampark-flink/streampark-flink-sqlclient/pom.xml +++ b/streampark-flink/streampark-flink-sqlclient/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-sqlclient_${scala.binary.version}</artifactId> diff --git a/streampark-flink/streampark-flink-udf/pom.xml b/streampark-flink/streampark-flink-udf/pom.xml index afe95fb0e..2bc84e79d 100644 --- a/streampark-flink/streampark-flink-udf/pom.xml +++ b/streampark-flink/streampark-flink-udf/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-flink</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-flink-udf_${scala.binary.version}</artifactId> diff --git a/streampark-shaded/pom.xml b/streampark-shaded/pom.xml index 44faf3d46..93d61a5a6 100644 --- a/streampark-shaded/pom.xml +++ b/streampark-shaded/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-shaded</artifactId> diff --git a/streampark-spark/pom.xml b/streampark-spark/pom.xml index 31ac11780..3da6814ff 100644 --- a/streampark-spark/pom.xml +++ b/streampark-spark/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-spark</artifactId> diff --git a/streampark-spark/streampark-spark-cli/pom.xml b/streampark-spark/streampark-spark-cli/pom.xml index a4c7c9bb2..80b8c571e 100644 --- a/streampark-spark/streampark-spark-cli/pom.xml +++ b/streampark-spark/streampark-spark-cli/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-spark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-spark-cli</artifactId> diff --git a/streampark-spark/streampark-spark-connector/pom.xml b/streampark-spark/streampark-spark-connector/pom.xml index 7677f2a66..410623e34 100644 --- a/streampark-spark/streampark-spark-connector/pom.xml +++ b/streampark-spark/streampark-spark-connector/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-spark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-spark-connector_2.12</artifactId> diff --git a/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml b/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml index 4b5a0319e..91c13a536 100644 --- a/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml +++ b/streampark-spark/streampark-spark-connector/streampark-spark-connector-base/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-spark-connector_2.12</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-spark-connector-base_2.12</artifactId> diff --git a/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml b/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml index 8e7161de3..945030c03 100644 --- a/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml +++ b/streampark-spark/streampark-spark-connector/streampark-spark-connector-kafka/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-spark-connector_2.12</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-spark-connector-kafka_2.12</artifactId> diff --git a/streampark-spark/streampark-spark-core/pom.xml b/streampark-spark/streampark-spark-core/pom.xml index c0e6387d8..11079ebe5 100644 --- a/streampark-spark/streampark-spark-core/pom.xml +++ b/streampark-spark/streampark-spark-core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark-spark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-spark-core_2.12</artifactId> diff --git a/streampark-storage/pom.xml b/streampark-storage/pom.xml index f06e827c8..abfffa6d8 100644 --- a/streampark-storage/pom.xml +++ b/streampark-storage/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.streampark</groupId> <artifactId>streampark</artifactId> - <version>2.1.0</version> + <version>2.1.1</version> </parent> <artifactId>streampark-storage</artifactId>
