You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2024/02/20 13:31:52 UTC

(incubator-streampark) branch dev updated: [BUG][FLINK-DEPEND]Fix flink lib to exclude dependencies that do not end in.jar (#3568)

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new caf4cd762 [BUG][FLINK-DEPEND]Fix flink lib to exclude dependencies that do not end in.jar  (#3568)
caf4cd762 is described below

commit caf4cd76237c0c34511fc684833e75a5bac4cd08
Author: ZhilinLi <zh...@gmail.com>
AuthorDate: Tue Feb 20 21:31:47 2024 +0800

    [BUG][FLINK-DEPEND]Fix flink lib to exclude dependencies that do not end in.jar  (#3568)
    
    * [fix][bug]Fix flink lib to exclude dependencies that do not end in.jar to avoid conflicts
    
    * fix code style
---
 .../scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala b/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
index de3b9eaed..380ed53f9 100644
--- a/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
+++ b/streampark-flink/streampark-flink-proxy/src/main/scala/org/apache/streampark/flink/proxy/FlinkShimsProxy.scala
@@ -165,7 +165,10 @@ object FlinkShimsProxy extends Logger {
     SHIMS_CLASS_LOADER_CACHE.getOrElseUpdate(
       s"${flinkVersion.fullVersion}", {
         // 1) flink/lib
-        val libURL = getFlinkHomeLib(flinkVersion.flinkHome, "lib", !_.getName.startsWith("log4j"))
+        val libURL = getFlinkHomeLib(
+          flinkVersion.flinkHome,
+          "lib",
+          file => (!file.getName.startsWith("log4j") && file.getName.endsWith(".jar")))
         val shimsUrls = ListBuffer[URL](libURL: _*)
 
         // 2) add all shims jar