modify version to 4.1.0-SNAPSHOT

qlangtech · Oct 28, 2024 · 5719361 · 5719361
1 parent 711398d
commit 5719361
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.../tis-datax-hudi-plugin/src/main/java/com/alibaba/datax/plugin/writer/hudi/HudiConfig.java b/.../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/...x-sqlserver-plugin/src/main/java/com/qlangtech/tis/plugin/datax/DataXSqlserverWriter.java b/...x-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
@@ -40,7 +40,7 @@
         <!--https://github.com/ververica/flink-cdc-connectors-->
 <!--        <flink.cdc.version>2.1.0</flink.cdc.version>-->
         <flink.cdc.version>3.1.0</flink.cdc.version>
-        <chunjun.version>1.12.5.20240701</chunjun.version>
+        <chunjun.version>1.12.5-${revision}</chunjun.version>
         <debezium-connector.version>1.9.8.Final</debezium-connector.version>
     </properties>
 

diff --git a/...scala-compiler/src/main/java/com/qlangtech/tis/compiler/streamcode/CompileAndPackage.java b/...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<PluginWrapper.Dependency> extraPluginDependencies;
-    private final Set<PluginManifest.ExplodePluginManifest> classInExtraPlugin;
+    private final Set<PluginManifest> classInExtraPlugin;
 
     public CompileAndPackage(List<PluginWrapper.Dependency> 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
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.qlangtech.tis.plugins</groupId>
             <artifactId>tis-datax-common-plugin</artifactId>
-            <version>4.0.0</version>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>