diff --git a/tis-datax/tis-datax-hudi-plugin/src/main/java/com/alibaba/datax/plugin/writer/hudi/HudiConfig.java b/tis-datax/tis-datax-hudi-plugin/src/main/java/com/alibaba/datax/plugin/writer/hudi/HudiConfig.java index eee7e3cce..69953ce8d 100644 --- a/tis-datax/tis-datax-hudi-plugin/src/main/java/com/alibaba/datax/plugin/writer/hudi/HudiConfig.java +++ b/tis-datax/tis-datax-hudi-plugin/src/main/java/com/alibaba/datax/plugin/writer/hudi/HudiConfig.java @@ -19,6 +19,7 @@ package com.alibaba.datax.plugin.writer.hudi; import com.qlangtech.tis.extension.impl.PluginManifest; +import com.qlangtech.tis.extension.impl.PluginManifest.ExplodePluginManifest; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; @@ -72,7 +73,7 @@ public static File getHudiDependencyDir() { } private static File getHudiPluginLibDir() { - return PluginManifest.create(HudiConfig.class).getPluginLibDir(); + return ((ExplodePluginManifest) PluginManifest.create(HudiConfig.class)).getPluginLibDir(); // return Config.getPluginLibDir(); diff --git a/tis-datax/tis-datax-sqlserver-plugin/src/main/java/com/qlangtech/tis/plugin/datax/DataXSqlserverWriter.java b/tis-datax/tis-datax-sqlserver-plugin/src/main/java/com/qlangtech/tis/plugin/datax/DataXSqlserverWriter.java index affe5b93d..9e6d43d96 100644 --- a/tis-datax/tis-datax-sqlserver-plugin/src/main/java/com/qlangtech/tis/plugin/datax/DataXSqlserverWriter.java +++ b/tis-datax/tis-datax-sqlserver-plugin/src/main/java/com/qlangtech/tis/plugin/datax/DataXSqlserverWriter.java @@ -149,7 +149,7 @@ public DefaultDescriptor() { @Override public boolean isSupportIncr() { - return false; + return true; } @Override diff --git a/tis-incr/pom.xml b/tis-incr/pom.xml index bc73fc4a8..55e244878 100644 --- a/tis-incr/pom.xml +++ b/tis-incr/pom.xml @@ -40,7 +40,7 @@ 3.1.0 - 1.12.5.20240701 + 1.12.5-${revision} 1.9.8.Final diff --git a/tis-incr/tis-scala-compiler/src/main/java/com/qlangtech/tis/compiler/streamcode/CompileAndPackage.java b/tis-incr/tis-scala-compiler/src/main/java/com/qlangtech/tis/compiler/streamcode/CompileAndPackage.java index b6481dfc6..d2eedb707 100644 --- a/tis-incr/tis-scala-compiler/src/main/java/com/qlangtech/tis/compiler/streamcode/CompileAndPackage.java +++ b/tis-incr/tis-scala-compiler/src/main/java/com/qlangtech/tis/compiler/streamcode/CompileAndPackage.java @@ -80,7 +80,7 @@ public class CompileAndPackage implements ICompileAndPackage { private static final Logger logger = LoggerFactory.getLogger(CompileAndPackage.class); private final List extraPluginDependencies; - private final Set classInExtraPlugin; + private final Set classInExtraPlugin; public CompileAndPackage(List extraPluginDependencies) { this(extraPluginDependencies, Collections.emptySet()); @@ -298,8 +298,9 @@ public void receiveLog(LogProcessorUtils.Level level, String line) { return Config.getPluginLibDir(plugin.shortName).getAbsolutePath() + "/*"; }).collect(Collectors.toList())); - depClasspath.addAll(this.classInExtraPlugin.stream().map((clazzInPlugin) -> { - return clazzInPlugin.getPluginLibDir().getAbsolutePath() + "/*"; + depClasspath.addAll(this.classInExtraPlugin.stream().flatMap((clazzInPlugin) -> { + return clazzInPlugin.getClasspath().stream(); + // return clazzInPlugin.getPluginLibDir().getAbsolutePath() + "/*"; }).collect(Collectors.toList())); return ScalaCompilerSupport.streamScriptCompile(sourceRoot, depClasspath, loggerListener); diff --git a/tis-transformer/pom.xml b/tis-transformer/pom.xml index 0ad49470a..6cd299785 100644 --- a/tis-transformer/pom.xml +++ b/tis-transformer/pom.xml @@ -41,7 +41,7 @@ com.qlangtech.tis.plugins tis-datax-common-plugin - 4.0.0 + ${project.version} test