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 index 80f1dd469e..70b9fca41c 100644 --- 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 index 94e9f1baa5..cb5a1ced18 100644 --- 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 @@ flink112-standalone UTF-8 - 1.12.5 + 1.12.7 2.12 2.7 2.1.0 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 index e164d36dd1..bd9846a53a 100644 --- 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 @@ UTF-8 - 1.12.5 + 1.12.7 2.12 2.7 diff --git a/taier-worker/taier-worker-plugin/flink/yarn-hdfs-flink112-core/src/main/java/com/dtstack/taier/flink/util/FlinkUtil.java b/taier-worker/taier-worker-plugin/flink/yarn-hdfs-flink112-core/src/main/java/com/dtstack/taier/flink/util/FlinkUtil.java index f5414b9db9..a2054c70a4 100644 --- a/taier-worker/taier-worker-plugin/flink/yarn-hdfs-flink112-core/src/main/java/com/dtstack/taier/flink/util/FlinkUtil.java +++ b/taier-worker/taier-worker-plugin/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 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 index d9375ecb98..3b92b61e34 100644 --- 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 @@ yarn2-hdfs2-flink112 UTF-8 - 1.12.5 + 1.12.7 2.12 2.7 2.1.0 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 index 559dae975f..14fb1fa55a 100644 --- 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 @@ yarn3-hdfs3-flink112 UTF-8 - 1.12.5 + 1.12.7 2.12 2.7 2.1.0