Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix][taier-data-develop] com.dtstack.chunjun.util.FactoryHelper should be loaded by DtClassloader #837

Merged
merged 1 commit into from
Nov 1, 2022
Merged

[fix][taier-data-develop] com.dtstack.chunjun.util.FactoryHelper should be loaded by DtClassloader #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions taier-scheduler/src/main/java/com/dtstack/taier/scheduler/service/ScheduleDictService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
}
Expand Down
2 changes: 1 addition & 1 deletion taier-worker/taier-worker-plugin/flink/flink112-standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion taier-worker/taier-worker-plugin/flink/yarn-hdfs-flink112-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion ...n/flink/yarn-hdfs-flink112-core/src/main/java/com/dtstack/taier/flink/util/FlinkUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion taier-worker/taier-worker-plugin/flink/yarn2-hdfs2-flink112/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion taier-worker/taier-worker-plugin/flink/yarn3-hdfs3-flink112/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down