[fix][taier-data-develop] com.dtstack.chunjun.util.FactoryHelper shou…

…ld be loaded by DtClassloader (DTStack#837)
hanbeikai · Nov 1, 2022 · 25abd26 · 25abd26
1 parent 5d757b1
commit 25abd26
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ScheduleDictService.java b/taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ScheduleDictService.java
@@ -26,7 +26,6 @@
 import com.dtstack.taier.dao.domain.Dict;
 import com.dtstack.taier.dao.mapper.ComponentConfigMapper;
 import com.dtstack.taier.dao.mapper.DictMapper;
-import com.dtstack.taier.pluginapi.enums.EDeployMode;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,9 +120,6 @@ public String convertVersionNameToValue(String componentVersion, Integer taskTyp
         if (null != dictType) {
             Dict versionDict = getByNameAndValue(dictType, componentVersion.trim(), null, null);
             if (null != versionDict) {
-                if(EDeployMode.STANDALONE.getType().equals(deployMode)) {
-                    return versionDict.getDictValue() + "_standalone";
-                }
                 return versionDict.getDictValue();
             }
         }

diff --git a/taier-worker/taier-worker-plugin/flink/flink112-standalone/pom.xml b/taier-worker/taier-worker-plugin/flink/flink112-standalone/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <pluginDir.name>flink112-standalone</pluginDir.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.12.5</flink.version>
+        <flink.version>1.12.7</flink.version>
         <scala.version>2.12</scala.version>
         <gson.version>2.7</gson.version>
         <hive.version>2.1.0</hive.version>

diff --git a/taier-worker/taier-worker-plugin/flink/yarn-hdfs-flink112-core/pom.xml b/taier-worker/taier-worker-plugin/flink/yarn-hdfs-flink112-core/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.12.5</flink.version>
+        <flink.version>1.12.7</flink.version>
         <scala.version>2.12</scala.version>
         <gson.version>2.7</gson.version>
     </properties>

diff --git a/...n/flink/yarn-hdfs-flink112-core/src/main/java/com/dtstack/taier/flink/util/FlinkUtil.java b/...n/flink/yarn-hdfs-flink112-core/src/main/java/com/dtstack/taier/flink/util/FlinkUtil.java
@@ -163,7 +163,8 @@ public static PackagedProgram buildProgram(String jarPath, List<URL> classPaths,
         // 指定采用parent ClassLoader优先加载的类
         String append = flinkConfig.getString(CoreOptions.ALWAYS_PARENT_FIRST_LOADER_PATTERNS_ADDITIONAL);
         if (jobType == EJobType.SQL || jobType == EJobType.SYNC) {
-            String dtstackAppend = "com.fasterxml.jackson.";
+            //String dtstackAppend = "com.fasterxml.jackson.";
+            String dtstackAppend = ConfigConstant.PARENT_FIRST_LOADER_PATTERNS_DEFAULT;
             if (StringUtils.isNotEmpty(append)) {
                 dtstackAppend = dtstackAppend + ";" + append;
             }

diff --git a/taier-worker/taier-worker-plugin/flink/yarn2-hdfs2-flink112/pom.xml b/taier-worker/taier-worker-plugin/flink/yarn2-hdfs2-flink112/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <pluginDir.name>yarn2-hdfs2-flink112</pluginDir.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.12.5</flink.version>
+        <flink.version>1.12.7</flink.version>
         <scala.version>2.12</scala.version>
         <gson.version>2.7</gson.version>
         <hive.version>2.1.0</hive.version>

diff --git a/taier-worker/taier-worker-plugin/flink/yarn3-hdfs3-flink112/pom.xml b/taier-worker/taier-worker-plugin/flink/yarn3-hdfs3-flink112/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <pluginDir.name>yarn3-hdfs3-flink112</pluginDir.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <flink.version>1.12.5</flink.version>
+        <flink.version>1.12.7</flink.version>
         <scala.version>2.12</scala.version>
         <gson.version>2.7</gson.version>
         <hive.version>2.1.0</hive.version>