Merge pull request #57 from aliyun/feature/release-v1.1.10-2

release 1.1.10

Author: Garfier

README.md

@@ -102,7 +102,7 @@ Node is the definition of workflow node.
 | `runtimeResource` |   [`RuntimeResource`](#runtimeResource)    | No       | runtime resource define or reference of the node                                                    |
 |   `recurrence`    |                   string                   | No       | `recurrence` defines cycle schedule state of node, see enumerated values: [Recurrence](#recurrence) |
 |    `priority`     |                  integer                   | No       | priority of the node, the larger the value, the higher the priority                                 |
-|     `timeout`     |                  integer                   | No       | timeout in seconds of the node, node instance will be killed when timed out after specified seconds |
+|     `timeout`     |                  integer                   | No       | timeout in hours of the node, node instance will be killed when timed out after specified hours     |
 |  `instanceMode`   |                   string                   | No       | instance mode of the node, see enumerated values [InstanceMode](#instancemode)                      |
 |    `rerunMode`    |                   string                   | No       | the rerun strategy of the node instance, see enumerated values [RerunMode](#rerunmode)              |
 

README_zh_CN.md

@@ -101,7 +101,7 @@ ManualWorkflowSpec是手动触发工作流`ManualWorkflow`的定义描述
 | `runtimeResource` |   [`RuntimeResource`](#runtimeResource)    | 否    | 节点的运行时资源定义或引用                                                   |
 |   `recurrence`    |                   string                   | 否    | `recurrence`定义周期调度节点的调度状态, 具体值参考枚举类型: [Recurrence](#recurrence) |
 |    `priority`     |                  integer                   | 否    | 定义节点的优先级, 数值越大优先级越高                                             |
-|     `timeout`     |                  integer                   | 否    | 定义节点的超时时间，运行超过指定时间后，节点将会被kill掉，单位为秒                             |
+|     `timeout`     |                  integer                   | 否    | 定义节点的超时时间，运行超过指定时间后，节点将会被kill掉，单位为小时                            |
 |  `instanceMode`   |                   string                   | 否    | 节点的实例化模式，具体值参考枚举类型：[InstanceMode](#instancemode)                |
 |    `rerunMode`    |                   string                   | 否    | 节点重试策略，具体值参考枚举类型：[RerunMode](#rerunmode)                        |
 

client/client-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.aliyun.dataworks</groupId>
         <artifactId>client</artifactId>
-        <version>1.1.9-16</version>
+        <version>1.1.10-2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/client-common/src/main/bin/common.py

@@ -63,7 +63,7 @@ def run_command(app_type, main_class=None):
         "-DappType=" + app_type,
         "com.aliyun.dataworks.client.command.CommandAppEntrance" if not main_class else main_class
     ]
-
+    print(cmd)
     verbose = True if 'CLIENT_VERBOSE' not in os.environ else bool(os.environ['CLIENT_VERBOSE'])
     if verbose:
         logging_file = os.path.abspath(os.path.join(get_log_path(), app_type + ".log"))

client/client-spark-utils/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.aliyun.dataworks</groupId>
         <artifactId>client</artifactId>
-        <version>1.1.9-16</version>
+        <version>1.1.10-2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/client-toolkits/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.aliyun.dataworks</groupId>
         <artifactId>client</artifactId>
-        <version>1.1.9-16</version>
+        <version>1.1.10-2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/migrationx/migrationx-common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>migrationx</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.9-16</version>
+        <version>1.1.10-2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/migrationx/migrationx-common/src/main/java/com/aliyun/migrationx/common/utils/Config.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import lombok.Data;
@@ -75,6 +76,10 @@ public boolean isVersion32() {
 
     private boolean includeGlobalParam = true;
 
+    private String scriptDir;
+
+    private Map<String, String> postHandlers;
+
     @Data
     public static class Replaced {
         private String taskType;

client/migrationx/migrationx-domain/migrationx-domain-adf/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.aliyun.dataworks</groupId>
         <artifactId>migrationx-domain</artifactId>
-        <version>1.1.9-16</version>
+        <version>1.1.10-2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

client/migrationx/migrationx-domain/migrationx-domain-airflow/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>migrationx-domain</artifactId>
         <groupId>com.aliyun.dataworks</groupId>
-        <version>1.1.9-16</version>
+        <version>1.1.10-2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>